Merge "mediaextractor: ensure no direct open()s" am: e22e99a68b
am: ea17be6014

Change-Id: I04573b201588661a98b682224624bb804ec688db