Merge changes Ie2cfc3ba,Id4f9d512

* changes:
  Convert Android.mk to Android.bp
  Compile libjsoncpp for the host too.