Android support and Password field type

Separated these out.. apologies for the mess of reverts and commits!