Merge "Merge "Enable priority boost for non-Jack builds." am: 847c70da66" into stage-aosp-master
am: 2e8ba8dd5c

Change-Id: I8b8b8cfb2f8671726d1661e7e9b634f2ac374930