Merge "DO NOT MERGE Remove *.aidl for parcelable declarations from srcs" into qt-dev