Merged with r13 of android-support-v4