Simplify and remove old comment

Change-Id: Iee41641252f65cea9ce0ea0ec1ea4229608f7c64
diff --git a/media/libmedia/Android.mk b/media/libmedia/Android.mk
index 26d94b0..e0acae6 100644
--- a/media/libmedia/Android.mk
+++ b/media/libmedia/Android.mk
@@ -63,8 +63,7 @@
 LOCAL_SHARED_LIBRARIES := \
 	libui liblog libcutils libutils libbinder libsonivox libicuuc libicui18n libexpat \
         libcamera_client libstagefright_foundation \
-        libgui libdl libaudioutils
-LOCAL_SHARED_LIBRARIES += libnbaio
+        libgui libdl libaudioutils libnbaio
 
 LOCAL_STATIC_LIBRARIES += libinstantssq
 
@@ -88,7 +87,6 @@
 LOCAL_CFLAGS += -DANDROID_SMP=$(if $(findstring true,$(TARGET_CPU_SMP)),1,0)
 LOCAL_SRC_FILES += SingleStateQueue.cpp
 LOCAL_CFLAGS += -DSINGLE_STATE_QUEUE_INSTANTIATIONS='"SingleStateQueueInstantiations.cpp"'
-# Consider a separate a library for SingleStateQueueInstantiations.
 
 LOCAL_MODULE := libinstantssq
 LOCAL_MODULE_TAGS := optional