Merge "com.android.mediadrm.signer is built with java_sdk_library" into pi-dev-plus-aosp