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

Change-Id: Id5272fe9891efa3994aa939fa6bbabef0789735e