Merge changes Idb1cdad9,I13b9b70c

* changes:
  Fix indentation
  Split goldfish_address_space to per platform implementation