Merge "Build android.test.* with java_sdk_library"