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

Change-Id: Ibf8ee8c6da1fbb3358179044c99861905751884c