am 4636abe5: Merge "Real "LOCAL_MULTILIB := both" for prebuilts"

* commit '4636abe5899272e1e9051e2c98516409107c4e8c':
  Real "LOCAL_MULTILIB := both" for prebuilts