[automerger skipped] Merge "com.android.mediadrm.signer is built with java_sdk_library" am: c55e1b6f4d am: 5a16c39891  -s ours
am: 09971a5452  -s ours

Change-Id: Ic9887d8b154c43b307ec25f66709c88d106b1538