Merge "Revert "Add adb keys to debuggable AOSP builds""