Merge "Add adb keys to debuggable AOSP builds"
am: 40cd480454

Change-Id: Ib3c254058d07d5e94a998ee2c5b37634ab0b32b6