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

Change-Id: I56c5e1f53e9351ceb85521df00f6baca3c8fa49d