Merge "Prevent otapreopt_chroot from crashing with no arguments"
am: aaf2c87e2a

Change-Id: I8381ea0306c7797f69d589fcd3dde3b88669915b