Merge "Make libjsoncpp apex-available to com.android.neuralnetworks."