Merge "Record module type statistics"

diff --cc core/Makefile
Simple merge

diff --cc core/clear_vars.mk
index 562a272,f1a9592..6121c45
--- 1/core/clear_vars.mk
--- 2/core/clear_vars.mk
+++ b/core/clear_vars.mk
@@@ -199,8 -199,8 +199,9 @@@ LOCAL_NOTICE_FILE:
  # to avoid installing the presigned apks with classes.dex unstripped.
  LOCAL_REPLACE_PREBUILT_APK_INSTALLED:=
  LOCAL_NDK_VERSION:=current
 +LOCAL_COPY_TO_INTERMEDIATE_LIBRARIES:=
  LOCAL_LOGTAGS_FILES:=
+ LOCAL_RECORDED_MODULE_TYPE:=
  
  # arch specific variables
  LOCAL_SRC_FILES_$(TARGET_ARCH):=

diff --cc core/definitions.mk
Simple merge