Merge "angler: Fix build for AOSP" into nyc-dev