Merge "Load build sysprops early"
am: 4fc83b1885

Change-Id: I032a51a6d3ee60a0915942b647d15ed0fd563d9f