Merge "Fix the broken build: aosp-master/sdk_x86-sdk"