jf: media update from GE 4.4.2 ML4

taken from the Google ML4 source drop

Change-Id: Ia021b17ef05e525be4acb3777bbc9bc82e3821ee