am 06db7324: resolved conflicts for merge of 0f99bb3d to klp-modular-dev-plus-aosp

* commit '06db73241a12a6b5f352647e966d254ae6443f68':
  Remove hardcoded TARGET_PREFER_32_BIT_APPS.