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

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