Merge c8f31f143e5ed2bfed4f47193fc7514580e87220 on remote branch

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