am 0f7bacf2: am 35edc538: Merge "Prepare to remove libhardware_legacy from global include dirs"

* commit '0f7bacf295f1a0e1beb6f55504cbde08f920b771':
  Prepare to remove libhardware_legacy from global include dirs