am 76ec0c4c: Merge "Set mcpu targets based on cpu variant."

* commit '76ec0c4c53aab6fca7af1badab882518962a9755':
  Set mcpu targets based on cpu variant.