Merge "Move MediaStore.java inside APEX boundary."