Merged with r12 of android-support-v4