Merge "Make libhidl(base|memory) apex-available for com.android.neuralnetworks."