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

Change-Id: If2113d2e1b75116b2547ae5e5dd823eaee20c157