am 2ae1c269: am 146cce0e: am cdecaca3: am dfc140cd: Merge "Vibra: emulator: compile and stage vibrator.goldfish"

* commit '2ae1c269a7984c72932e1797faad58587967ecdf':
  Vibra: emulator: compile and stage vibrator.goldfish