Merge "Make framework-media stubs use the new defaults" into rvc-dev am: 19b40d5b am: 3065a219 am: 7297507a Change-Id: I48097be824a6b5ad341ff44b91ca3a84e0c193b1