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

Change-Id: I25546aec1f69086837f532f4aba70441205a0844