Merge "Build com.android.media.remotedisplay with java_sdk_library"