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

Change-Id: I4d5fc08c050c1fb7be5ef1db55a20698e863b93d