Merge "Fix AOSP build (DO NOT MERGE)"