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

Change-Id: I2744b64979414acc115245ab997674c02e6b90eb