Explicitly include android-support-v4
am: 7f1d87fa8f

Change-Id: Idb6283e01286dedc6bbe72ae5c1ff10659004978