Organize lib targets Order them lexicographically. Move junit and its private dependency hamcrest into a subpackage. Change-Id: I059541885144981a3ab9f605492243da71bba2d0