Fix AOSP build bug