Fix aosp build