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

* commit '35edc53853877e6998e117357902579147f3e7e4':
  Prepare to remove libhardware_legacy from global include dirs