Merge "Make apex_available of nn hidl interfaces explicit in Android.bp"