Merge "Make includeDeviceRoot configurable" into arc-apps
am: 7d086bbcd7

Change-Id: Ib4e99c7f949aa8e513694c660764e4643cf7e285