am a4aace71: Merge change 2437 into donut

Merge commit 'a4aace716e76e8e2c2e6e1a807b402256d9924dc'

* commit 'a4aace716e76e8e2c2e6e1a807b402256d9924dc':
  Modify init.goldfish.sh to launch the 'qemu-props' program when the emulator boots up.