Merge changes I90852003,Icfc13bb5,I28e07b23

* changes:
  Convert libmediametrics to Android.bp
  Convert libmediadrm to Android.bp
  Fix warnings hidden by -isystem