am 92946baa: am 9d641c41: Merge "Fix public/private key options on sign_target_files_apks" into lmp-dev

* commit '92946baa035ee9376478185fbd74849730d20768':
  Fix public/private key options on sign_target_files_apks