resolved conflicts for merge of d2819621 to honeycomb-plus-aosp

Change-Id: I2c84ffb40bd1db769b9ce271206c3b680a4e3179
diff --git a/sdk/plat_tools_source.properties b/sdk/plat_tools_source.properties
index 47cffcf..189bca5 100644
--- a/sdk/plat_tools_source.properties
+++ b/sdk/plat_tools_source.properties
@@ -1,2 +1,2 @@
 Pkg.UserSrc=false
-Pkg.Revision=6
+Pkg.Revision=8
\ No newline at end of file