Merge hydro-devel-fixed onto android