Merge "Remove duplicated sources that go into hiddenapi-mappins"