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

Change-Id: Ib73ec37dabd7ddf511d7b10e43e95a9047e5db08