[automerger skipped] Merge "Frameworks/base: Support dex2oat cpu-set system...

[automerger skipped] Merge "Frameworks/base: Support dex2oat cpu-set system property" into qt-qpr1-dev am: 1756b8ec -s ours am: fadcd804 -s ours am: cf76460c -s ours am: 67f330de -s ours am: 10b3003e -s ours am: 9ef44e68 -s ours
am skip reason: Change-Id Ica6a39048292d3d43aeb58d25f79f1398a7d5a79 with SHA-1 2fd00cd4 is in history

Change-Id: I89d8656f9bed166442728f0a21e73a4632a1ffc8