Fix misc Android things.