[automerger skipped] Merge "com.android.mediadrm.signer is built with java_sdk_library" into pi-dev-plus-aosp
am: 611488ceac  -s ours

Change-Id: Ia6cddb5a3660ebc8c33a7c04497dfb6aebe5837d