Merge "[AU]Sync libmedia/Android.mk modification from KLP-Sprout" into lmp-dev