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

Change-Id: If53e428ad2e3ebd2c6df0468716eb30e27a83fe2