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

Change-Id: Ie0e8efe593d45e08878a77dbc20ba6c8ab9bb45c