Add a pre-chroot hook am: 64730afc5e
am: 8676caf74c

Change-Id: I9f40242c5010a89bdb88a1fea2531568a9d75e72