Initial r108 import w/ Android support