Merge "[automerger skipped] Merge "Remove duplicated sources that go into...

Merge "[automerger skipped] Merge "Remove duplicated sources that go into hiddenapi-mappins" am: 66089876 -s ours am: b18ec04a -s ours am: bc54a625 -s ours am: 51390404 -s ours
am: 64d03908 -s ours
am skip reason: change_id I9ea6e06e8bd388f3a495acb6ff5555c0ce2f75b2 with SHA1 0323b4d8 is in history

Change-Id: I832588124aeb7d4646042d946ea5974693b5eea2