am 30e5b46d: am fda4cc82: merge AOSP changes: media and graphics

* commit '30e5b46ded6a73b8b8191f590417ab8d41190494':
  merge AOSP changes: media and graphics