Merge "Make services.core the final priorityboosted jar"
am: a0c1780d3c

Change-Id: I4969cd15085ab460a112547e63362bf8c2bc1602