Merge "Disable 137-cfi and 629-vdex-speed in no-prebuild mode"