am fa2c68e8: am 51c47855: Merge "Vibra: compile and stage vibrator.default on all targets"

* commit 'fa2c68e81a356556298f7bab21a29c14f99f3051':
  Vibra: compile and stage vibrator.default on all targets