diff --git a/build/Android.mk b/build/Android.mk
index 9c22a24a2..21770acfa 100644
--- a/build/Android.mk
+++ b/build/Android.mk
@@ -137,3 +137,19 @@ android_test_stubs: $(full_target)
 # Build and store the android_test.jar.
 $(call dist-for-goals,sdk win_sdk,$(full_target):android_test.jar)
 $(call dist-for-goals,sdk win_sdk,$(full_target):apistubs/android/test/android.jar)
+
+# ============ Module Lib SDK ============
+full_target := $(call intermediates-dir-for,JAVA_LIBRARIES,android_module_lib_stubs_current,,COMMON)/classes.jar
+
+.PHONY: android_module_lib_stubs
+android_module_lib_stubs: $(full_target)
+
+$(call dist-for-goals,sdk win_sdk,$(full_target):apistubs/android/module-lib/android.jar)
+
+# ============ System server SDK ============
+full_target := $(call intermediates-dir-for,JAVA_LIBRARIES,android_system_server_stubs_current,,COMMON)/classes.jar
+
+.PHONY: android_system_server_stubs
+android_system_server_stubs: $(full_target)
+
+$(call dist-for-goals,sdk win_sdk,$(full_target):apistubs/android/system-server/android.jar)