am 616a2bb8: am 47cf57ae: am fbea2209: Merge "Remove uses of libcxx.mk."

* commit '616a2bb85800f2b4e9403e82b062a2adb5cd84c7':
  Remove uses of libcxx.mk.
tree: 6cc716bc3211afd3caf8131d68bfa1020df611ad
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/