Merge "remove extraneous `using namespace android`"