[automerger skipped] Merge "DO NOT MERGE Remove *.aidl for parcelable declarations from srcs" into qt-dev am: aa23deba63 am: 821024bef1 am: 8e4e8fd6a0 -s ours
am: 186600804a -s ours
am skip reason: subject contains skip directive

Change-Id: Ifc4c8510a2cd86c8fb09ca538a574b941a5623e8