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