Merge changes Ia14738de,I6f4cffdc into integration

* changes:
  fix(tc): change the properties of optee reserved memory
  feat(tc): use smmu 700