Clean up some leftover cruft in the Android source