Merge "Prepare to remove libhardware_legacy from global include dirs"