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

Change-Id: I85d7ad3c6dfda2e148a9f3ae59c51f8e361ab3af