Merge "Clean up ownership in frameworks/av/"