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

Change-Id: I02a30841e08cdd8d318d3a20c7d7cd48b47f9521