Merge "Track debug key changes in libcore/"
am: 462331f40f

Change-Id: Ibf4517dcd5933e60f4f4d51812f723cace2b4516