Merge "Initial commit for media apex bundle"
am: a0fd81b4ce

Change-Id: Id0c240f99a6237708523a3fcb155206951e88d26