Merge changes from topic "nnapi-aidl-memory-sc-dev" into sc-dev

* changes:
  Update NN utility code and VTS tests with new Memory type
  Improve the structure of NNAPI AIDL Memory