Merge tag 'android-5.1.1_r18' into cm-12.1

    android::Parcel* p = android::parcelForJavaObject(env, parcel);

    const size_t size = p->readInt32();

    const void* regionData = p->readInplace(size);

    if (regionData == NULL) {

        return NULL;

    }

    SkRegion* region = new SkRegion;

    size_t size = p->readInt32();

    region->readFromMemory(p->readInplace(size), size);

    size_t actualSize = region->readFromMemory(regionData, size);

    if (size != actualSize) {

        delete region;

        return NULL;

    }

    return reinterpret_cast<jlong>(region);

}

             android:textSize="16sp"

             android:textAppearance="?android:attr/textAppearanceMedium"

             android:imeOptions="flagForceAscii|actionDone"

             android:maxLength="500"

             />

         <ImageView android:id="@+id/switch_ime_button"