Merge fc2ed8460e436dcc82b64edbc5f701a8a7433353 on remote branch

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