Merge "Allow bootjars in system_ext." am: 6abe4fb0a7 am: 4ab8f542e9 am: ec82e99ca6

Change-Id: I2ce12c45dda82a0a49602d327e8f8403420306e1