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

Change-Id: I7114244f6975df03f818b31d6a384093935639d6