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

Change-Id: Ibba17cefcd97e8c4f81857eb0d02e5240dba015a