Merge 931c15474356b1015e4ae80d109c034dc40c1d36 on remote branch

Change-Id: I413af70066c8da9be31a44719aa1cb50bca6f744
diff --git a/vendor_snapshot/update.py b/vendor_snapshot/update.py
index d0dc0ac..ccf0d6f 100644
--- a/vendor_snapshot/update.py
+++ b/vendor_snapshot/update.py
@@ -50,7 +50,7 @@
 # convert .bp prop dictionary to .bp prop string
 def gen_bp_prop(prop, ind):
     bp = ''
-    for key in prop:
+    for key in sorted(prop):
         val = prop[key]
 
         # Skip empty list or dict, rather than printing empty prop like