Merge change 7774

* changes:
  enable cortex branch predition errata workaround for armv7-a builds