am a9dafdb8: am 51e11eea: Merge "reflect the migration of emulator hal to device/generic/goldfish" into jb-mr2-dev

* commit 'a9dafdb8ae1730e63928e98974d3bbb3fa3a02f5':
  reflect the migration of emulator hal to device/generic/goldfish