am f6e6e5e7: am 977a3313: Merge changes Iac00ce10,I192d3825

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