Merge "Fix core jars list in bootjars.sh ." am: d88f3eba1a
am: c8a534d0e7

Change-Id: I29714d6b0785d3238fbc61df576cf4263ea496ed