Merge changes from topic "nnapi-aidl-memory"

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