Merge "Enable priority boost for non-Jack builds." am: 847c70da66
am: 24a1598b5b

Change-Id: If65490df9f24444efa1040cfad1b2a1afe803afa