Merge changes Ifeffea05,I966f65a1

* changes:
  Remove uid from NN HIDL adapter
  Create NN AIDL adapter