Merge "Include what we use." am: b0efcc1f68
am: afa15b0846

Change-Id: I1f4ba5196d1118cfcd68821fa8ac0fbd17d8b5fc