Merge "Track debug key changes in libcore/"