Tidy up android build file for inclusion in other projects