[automerger skipped] Merge "Build android.test.* with java_sdk_library" into pi-dev-plus-aosp
am: 0df9368b0f  -s ours

Change-Id: I7bf14ee9fdc5d934d16eac70a5808a545bf8ec56