Merge "Fix fugu build break on aosp"