diff --git a/Android.mk b/Android.mk
index 98dfa6f8f..512f58511 100644
--- a/Android.mk
+++ b/Android.mk
@@ -46,57 +46,43 @@ HARFBUZZ_SRC_FILES = \
 	src/hb-ot-shape-fallback.cc
 
 #############################################################
-#   build the harfbuzz library
+#   build the harfbuzz shared library
 #
-
 include $(CLEAR_VARS)
-
 LOCAL_ARM_MODE := arm
-
 LOCAL_MODULE_TAGS := optional
-
 LOCAL_SRC_FILES:= \
 	$(HARFBUZZ_SRC_FILES) \
 	src/hb-icu.cc
-
 LOCAL_CPP_EXTENSION := .cc
-
 LOCAL_SHARED_LIBRARIES := \
         libcutils \
         libicuuc \
         libicui18n \
         libutils
-
 LOCAL_C_INCLUDES += \
         $(LOCAL_PATH)/src \
         external/icu4c/common
-
 LOCAL_CFLAGS += -DHB_NO_MT -DHAVE_OT -DHAVE_ICU
-
 LOCAL_MODULE:= libharfbuzz_ng
-
 include $(BUILD_SHARED_LIBRARY)
 
 #############################################################
 #   build the harfbuzz static library
 #
 include $(CLEAR_VARS)
-
 LOCAL_ARM_MODE := arm
 LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES:= \
 	$(HARFBUZZ_SRC_FILES) \
 	src/hb-ucdn.cc \
 	src/hb-ucdn/ucdn.c
-
-LOCAL_CPP_EXTENSION     := .cc
-LOCAL_STATIC_LIBRARIES  := libft2
-LOCAL_C_INCLUDES        := \
-  $(LOCAL_PATH)/src \
-  external/freetype/include
+LOCAL_CPP_EXTENSION := .cc
+LOCAL_STATIC_LIBRARIES := libft2
+LOCAL_C_INCLUDES += \
+	$(LOCAL_PATH)/src \
+	external/freetype/include
 LOCAL_CFLAGS += -DHB_NO_MT -DHAVE_OT -DHAVE_UCDN -DHAVE_FREETYPE
-
 LOCAL_MODULE:= libharfbuzz_ng
 
 include $(BUILD_STATIC_LIBRARY)
-