Merge "Make libhidl(base|memory) apex-available for com.android.neuralnetworks." am: 750364bd76 am: abe3f34125 am: 4065edea29

Change-Id: I4ee097b004ec988339b0d24cc608fc3e80db234a