bunch of android source git fixes