Merge "Add dexlayout option for updating checksum"
am: 59458a9b9c

Change-Id: Ic22e9544f01fe1cda8f7cb296de41f313efb7edc