Merge "com.android.mediadrm.signer is built with java_sdk_library"
am: c55e1b6f4d

Change-Id: I33dec56812e9207a3b60efbb8001c93bb67c5349