Merge "Convert three media binaries to Android.bp" am: 479b735392
am: 812f306ff8

Change-Id: If0c66be2d42005744226f17c103536951b12132f