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

Change-Id: Idbb31ea86acf74079d405c1c8989a7c504522710