Merge "reflect the migration of emulator hal to device/generic/goldfish" into jb-mr2-dev