Merge "adb: log more detail on failure to read keys." am: 69627e52b9 am: b186f5fe1f am: e90be182c9
am: 1326886206

Change-Id: Id4008dbce31c42dcaf8eb9be03660a51aa1dfa7a