Merge "Make com.android.common visible by neuralnetworks apex."