Merge "Use java_sdk_library for API for updatable-media am: 289a482f am:...
Merge "Use java_sdk_library for API for updatable-media am: 289a482f am: d5cc1260 am: 835ba54f" into rvc-qpr-dev-plus-aosp am: 9a4b94f1
Change-Id: I4974a67327e584e49232c575fcf6925caf839029