Improve the structure of NNAPI AIDL Memory am: dd53d04d8c

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

Change-Id: Ibcf677a263deaee456d311f8656df442c2aafada