merge AOSP changes: media and graphics

Change-Id: I0feb091a199a34f8b5a10d8118b0f2b334c0ce6e
2 files changed