Merge changes Ided4e9bb,I2808441c

* changes:
  Make libkeymint_remote_prov_support a static dep
  Add ro.serialno sysprop to JSON output