[automerger skipped] Merge "Remove duplicated sources that go into hiddenapi-mappins" am: 660898768f -s ours am: b18ec04aa7 -s ours
am: bc54a625e1 -s ours
am skip reason: change_id I9ea6e06e8bd388f3a495acb6ff5555c0ce2f75b2 with SHA1 0323b4d8a3 is in history

Change-Id: I59e31606f91389a92f7064980318bc108066f4f6