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

Change-Id: I9cddc201aacea8e6c6a1d36b8217fe4b3fdeb185