Merge "Load build sysprops early" am: 4fc83b1885 am: 14471cbe5d
am: cf05b13182

Change-Id: I595b3e624676e691d290b2b657efe8dad996d1c8