Merge "Fix ADB key file reading"