Merge "Treat parcelables as flattenables for now, until the sdk contains a newer aidl." into ics-aah