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

* commit '146cce0ebccd5381dad9394dad350f968652c23a':
  Vibra: emulator: compile and stage vibrator.goldfish