Merge "Allow bootjars in system_ext." am: 7097b0580c

Change-Id: I30c69ed439912603223285d75cfeb6e84690b133