Merge f86c39a02fff167dfcf97950eb32263fb63c63b5 on remote branch

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