[automerger skipped] Add cpu-set properties to serializer test am: 6ea9b8b580 -s ours
am skip reason: Change-Id I1232fec5f1d0be7e5fb6aa5c46f6c2c5529bfc6c with SHA-1 8e77b789f8 is in history

Change-Id: I0e13c779e06c07a648e4ac8ccbfeec437f4dbb7a