am 0ddbc6c2: Merge "resolved conflicts for merge of 084209e2 to...
am 0ddbc6c2: Merge "resolved conflicts for merge of 084209e2 to klp-modular-dev-plus-aosp" into klp-modular-dev-plus-aosp
* commit '0ddbc6c2':
CleanSpec for 08d410f5: Make libart the default runtime