Merge 327ca0f7db69c37fe584fa57278181c11968795e on remote branch

Change-Id: Id5758062ef437f1da72cee26cca2a72188ebec87
tree: 8e222b5ea53ad19662eeb1ea6d912dac9f5c1179
  1. aidl/
  2. effect/
  3. excluded-input-devices.xml
  4. vibrator-vendor-product.mk