Removes more Android specific, commented out ifndefs.