am e1b710a5: merge from open-source master

Merge commit 'e1b710a5ba16be660d5383f1e56bd76b664b1d05'

* commit 'e1b710a5ba16be660d5383f1e56bd76b664b1d05':
  Added prune options to findleaves.sh to ignore the .git and .repo
  Added a default to specify an alternative tool chain prefix if needed.
  Update prelink map for libFLAC

buildspec.mk.default

@@ -68,6 +68,9 @@ endif
 # will be added to LOCAL_CFLAGS when building the module.
 #DEBUG_MODULE_ModuleName:=true
 
+# Specify an alternative tool chain prefix if needed.
+#TARGET_TOOLS_PREFIX:=
+
 # Specify the extra CFLAGS to use when building a module whose
 # DEBUG_MODULE_ variable is set.  Host and device flags are handled
 # separately.

core/prelink-linux-arm.map

@@ -74,6 +74,7 @@ libRS.so                0xAB900000
 
 
 # audio
+libFLAC.so              0xAB8A0000
 libaudiopolicy.so       0xAB880000
 libaudiopolicygeneric.so 0xAB800000
 libsoundpool.so         0xAB780000