am f01dd38e: Merge "Remove CpuFeaturesTest for tlsi" into mnc-dev

* commit 'f01dd38e73c053466e9857176c0eba1b9bd9d52e':
  Remove CpuFeaturesTest for tlsi