Merge "Allow `otapreopt_chroot` to use a flattened Runtime APEX package."