Improve the structure of NNAPI AIDL Memory am: dd53d04d8c am: a0f169b2c4

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1666281

Change-Id: I326976b395838acf0c5301a059c962f84068cf3f