[automerger skipped] Build android.test.* with java_sdk_library
am: 63a6a00f44  -s ours

Change-Id: Id736c0c7f59541f1bfe9b259bb8ed1a8e9471c16