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

Change-Id: I635e819cfb3d27bf4035a8cdaa803eba3c17df4e