Merge \"Disable AVX support in bcc\"
am: d4af5eabb5

Change-Id: Iab5081d92f4a3aff63358973da19776ad6a9bb1d