[automerger skipped] Remove duplicated sources that go into hiddenapi-mappins...
[automerger skipped] Remove duplicated sources that go into hiddenapi-mappins am: 0323b4d8 am: 96b6abd6 am: f4cbc615
am: 3c6a4dd3 -s ours
am skip reason: change_id I9ea6e06e8bd388f3a495acb6ff5555c0ce2f75b2 with SHA1 68020f8f is in history
Change-Id: I38d158f445863a274dede42c660c4d2d7d6b45ce