Merge changes from topic "metrics_rerouting"

* changes:
  Add keystore API for metrics re-routing.
  Keystore2: Wait for statsd to be available before calling statsd_write()