Merge "Merge "Merge "Enable priority boost for non-Jack builds." am: 847c70da66" into stage-aosp-master am: 2e8ba8dd5c" into oc-dev-plus-aosp
am: 3f2c203353  -s ours

Change-Id: Icc718257845acb87b79784bb941ed61078a554b8