am 0a394f54: Merge commit \'3822b8b7\' into mnc-dev-plus-aosp

* commit '0a394f54284d1d6006cf938b1da28bb365aa52b9':
  Installd: Add debug.gencfi to run_dex2oat