Merge "Allow multiple native debug entries with same address."
am: 7201ef48fb

Change-Id: I3b7989ac207fcbb268f2c1732cc75f31ef8faa51