[automerger skipped] Merge "Frameworks/base: Support dex2oat cpu-set system property" into qt-qpr1-dev am: 1756b8ec84 -s ours am: fadcd80471 -s ours am: cf76460ced -s ours am: 67f330de33 -s ours am: 10b3003e65 -s ours am: 9ef44e684c -s ours
am skip reason: Change-Id Ica6a39048292d3d43aeb58d25f79f1398a7d5a79 with SHA-1 2fd00cd403 is in history

Change-Id: I89d8656f9bed166442728f0a21e73a4632a1ffc8