[automerger skipped] Merge "installd: add dex2oat cpu-set system properties" into qt-qpr1-dev am: 032fe38e -s ours am: 9751b7b3 -s ours am: 4fc8a158 -s ours
am skip reason: Change-Id Ic0d452fd1f2a9f94a55c39715111728b8104822a with SHA-1 45837466 is in history

Change-Id: I84c2cf825859b469f5fc002e936edfbfac18c2e3