Merge "Clean up ownership in frameworks/base/"