Merge "Make includeDeviceRoot configurable" into arc-apps