Merge "remove extraneous `using namespace android`"
am: 8e661076b6

Change-Id: Ie4c4191c448b78afddba31c712c6963238d92169