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

Change-Id: Ie6fece6bf510cfcff66448ed2ec9f0a9bf7cee93