Merge "Fix build error for sdk_gphone_x86_64-userdebug"