Merge c9bf693bd1080c14423a367c174caff6458e4dd7 on remote branch

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