[automerger skipped] Merge "Frameworks/base: Support dex2oat cpu-set system property" into qt-qpr1-dev am: 1756b8ec84 -s ours am: fadcd80471 -s ours am: 30f49e35fe -s ours am: f5a231ba9c -s ours
am skip reason: Change-Id Ica6a39048292d3d43aeb58d25f79f1398a7d5a79 with SHA-1 2fd00cd403 is in history
Change-Id: I5f3ee8bf0ba86810d7cfff7cc5448ba6991ec5b2
This commit is contained in: