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