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

Change-Id: I6bfb82e7af42ee67f61d9d76e99cc48e0f099356