Merge "Allow debug mode to be enabled on touch devices." into arc-apps
am: 1d1a16333d

Change-Id: Iba394e5701474dab207149641c130675d67ebc7b