diff --git a/Android.mk b/Android.mk
index dad5920e4..e1ee1705c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -82,7 +82,6 @@ LOCAL_SRC_FILES                                          := \
     src/core/api/tasklet_api.cpp                            \
     src/core/api/thread_api.cpp                             \
     src/core/api/thread_ftd_api.cpp                         \
-    src/core/api/tmf_proxy_api.cpp                          \
     src/core/api/udp_api.cpp                                \
     src/core/coap/coap.cpp                                  \
     src/core/coap/coap_header.cpp                           \
@@ -109,6 +108,7 @@ LOCAL_SRC_FILES                                          := \
     src/core/mac/mac_filter.cpp                             \
     src/core/mac/mac_frame.cpp                              \
     src/core/meshcop/announce_begin_client.cpp              \
+    src/core/meshcop/border_agent.cpp                       \
     src/core/meshcop/commissioner.cpp                       \
     src/core/meshcop/dataset.cpp                            \
     src/core/meshcop/dataset_local.cpp                      \
@@ -158,7 +158,6 @@ LOCAL_SRC_FILES                                          := \
     src/core/thread/router_table.cpp                        \
     src/core/thread/src_match_controller.cpp                \
     src/core/thread/thread_netif.cpp                        \
-    src/core/thread/tmf_proxy.cpp                           \
     src/core/thread/topology.cpp                            \
     src/core/utils/channel_manager.cpp                      \
     src/core/utils/channel_monitor.cpp                      \
diff --git a/include/openthread-config-android.h b/include/openthread-config-android.h
index ce4708e95..9003b38f0 100644
--- a/include/openthread-config-android.h
+++ b/include/openthread-config-android.h
@@ -87,6 +87,9 @@
 /* Define to 1 if you want to enable CoAP to an application. */
 #define OPENTHREAD_ENABLE_APPLICATION_COAP 1
 
+/* Define to 1 to enable the border agent feature. */
+#define OPENTHREAD_ENABLE_BORDER_AGENT 1
+
 /* Define to 1 if you want to enable Border Router */
 #define OPENTHREAD_ENABLE_BORDER_ROUTER 1
 
@@ -157,8 +160,8 @@
 /* Define to 1 if you want to enable Service */
 #define OPENTHREAD_ENABLE_SERVICE 1
 
-/* Define to 1 to enable the TMF proxy feature. */
-#define OPENTHREAD_ENABLE_TMF_PROXY 1
+/* Define to 1 to enable the UDP proxy feature. */
+#define OPENTHREAD_ENABLE_UDP_PROXY 1
 
 /* OpenThread examples */
 #define OPENTHREAD_EXAMPLES none