Merge "Make libjsoncpp apex-available to com.android.neuralnetworks." am: c5828add18 am: ea7c2dcbf7

Change-Id: I49d13da0fb4ef40bacde4942d33c585bcb62efd4