[automerger skipped] Merge "Remove duplicated sources that go into hiddenapi-mappins"
am:660898768f-s ours am skip reason: change_id I9ea6e06e8bd388f3a495acb6ff5555c0ce2f75b2 with SHA10323b4d8a3is in history Change-Id: I822cb1db6a1785a449abad5e76a7140b23f2185c
This commit is contained in: