merge android branch (specs)