Upgrade SDK and Framework, Add Android support