am fda4cc82: merge AOSP changes: media and graphics

* commit 'fda4cc82f90532f15ea50094aa02fb9200aa517f':
  merge AOSP changes: media and graphics