Merge "Build android.test.* with java_sdk_library"
am: f4fc71f370

Change-Id: Ied107019ebea67b77440981d31c38abeb695e40c