[automerger skipped] Add cpu-set properties to serializer test am: 6ea9b8b5...
[automerger skipped] Add cpu-set properties to serializer test am: 6ea9b8b5 -s ours am: 88b85abc -s ours am: 7092301d -s ours
am skip reason: Change-Id I1232fec5f1d0be7e5fb6aa5c46f6c2c5529bfc6c with SHA-1 8e77b789 is in history
Change-Id: I82dbd5a032b6703a8d564118c166d4ef3cc3326f