am 977a3313: Merge changes Iac00ce10,I192d3825

* commit '977a33137d2be0093f474055f839cf665b82b588':
  bionic: add tests for properties
  bionic: move system property writing from init to bionic