Merge "lshal: SerializeFlag => SerializeFlags" am: a6f756800f am: b80d29a439 am: d86ca5178b
am: c5e588629d

Change-Id: Ibf4fc46a3199f7f90fe5ce746bcdbfd9cc176c3f