Merge "Ran update-makefiles.sh."

diff --cc Android.bp
index c69caf0,c568092..1b68a09
--- 1/Android.bp
--- 2/Android.bp
+++ b/Android.bp
@@@ -10,7 -11,7 +11,8 @@@ subdirs = 
      "tests/libhwbinder/1.0",
      "tests/msgq/1.0",
      "tests/pointer/1.0",
+     "vibrator/1.0",
      "wifi/1.0",
      "wifi/supplicant/1.0",
 +    "vibrator/1.0",
  ]