Merge "Include what you use" into oc-dev
am: d630ecee00

Change-Id: I28388458294390ce658092bbe7499c49139d2cfe