fixed aosp build