Merge "Fix public/private key options on sign_target_files_apks" into lmp-dev