Merge branch 'open_source' into google_internal

Conflicts:
	core/build_id.mk

tools/atree/files.cpp

@@ -7,6 +7,8 @@
 #include <unistd.h>
 #include <dirent.h>
 #include <fnmatch.h>
+#include <string.h>
+#include <stdlib.h>
 
 static bool
 is_comment_line(const char* p)

tools/atree/fs.cpp

@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#include <string.h>
 #include <host/CopyFile.h>
 
 using namespace std;

tools/droiddoc/src/ClassInfo.java

@@ -378,16 +378,8 @@ public class ClassInfo extends DocInfo implements ContainerInfo, Comparable, Sco
 
     public TagInfo[] deprecatedTags()
     {
-        TagInfo[] result = comment().deprecatedTags();
-        if (result.length == 0) {
-            if (comment().undeprecateTags().length == 0) {
-                if (superclass() != null) {
-                    result = superclass().deprecatedTags();
-                }
-            }
-        }
-        // should we also do the interfaces?
-        return result;
+        // Should we also do the interfaces?
+        return comment().deprecatedTags();
     }
 
     public MethodInfo[] methods()

tools/findleaves.sh

@@ -86,7 +86,7 @@ filename="${!nargs}"
 # Print out all files that match, as long as the path isn't explicitly
 # pruned. This will print out extraneous results from directories whose
 # parents have a match. These are filtered out by the awk script below.
-find "${@:0:$nargs}" $findargs -type f -name "$filename" -print |
+find -L "${@:1:$nargs-1}" $findargs -type f -name "$filename" -print |
 
 # Only pass along the directory of each match.
 sed -e 's/\/[^\/]*$/\//' |