Merge "Allow bootjars in system_ext." am: 6abe4fb0a7

Change-Id: Id56f3b2ed464de43b9b029c16e5f874019b6a88c