[automerger skipped] Merge "Build android.test.* with java_sdk_library" am: f4fc71f370 am: f298a0643b  -s ours
am: 254d818f88  -s ours

Change-Id: I10e497814b082d001d62ba5a4485b57ba21af695