Merge 5d179ffc66f293f1f123d229d8bcc8bf8997faff on remote branch

Change-Id: Iff48265f3e9b6b834f03e87b25a16271009d6162
tree: 61ffe798933dab8f225ef96d6e00b0f544943138
  1. 1.2/
  2. 1.3/
  3. qmaa/
  4. excluded-input-devices.xml
  5. vibrator-vendor-product.mk