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

Change-Id: Ie7b30a769d6120723be923d3a585ebf75aef5c60