Merge 9fc04fc8f6a538f0bf6f290af98700e88c5caf5e on remote branch

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