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

Change-Id: I5956bcce7b4e0d0f977edfe0560157682d34b52e