Merge 2feeb5e8573bf1b7fc6f682ccc91bd5444ee2a1b on remote branch

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