Merge "fix build" into nyc-dev-plus-aosp