Merge \\"Factor out common include directories into helper\\" am: 95fa32b577
am: 17904fabbf

Change-Id: I3236f73dc98720778979352258e91d39a5d05b2f