[automerger skipped] Merge "DO NOT MERGE Remove *.aidl for parcelable...

[automerger skipped] Merge "DO NOT MERGE Remove *.aidl for parcelable declarations from srcs" into qt-dev am: aa23deba am: 821024be am: 8e4e8fd6 -s ours
am skip reason: Change-Id I0705ddf76b3c628127f65d75e0a8b06c6c250fe2 with SHA-1 7e1339e0 is in history

Change-Id: Ie704e9f0d5a3c38ee6f393fb0b5a82e92ae77f31