Android 8.1.0 release 22
Explicitly include android-support-v4 am: 7f1d87fa8f
am: 0269d85099

Change-Id: Ieacc71cc38d4d488ba34c732034bd40eff2bcaa8