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

* commit '9d641c41db732c4e9e7a5dac074197f1a9d40bcc':
  Fix public/private key options on sign_target_files_apks