Merge "liblog: Assure shifting behavior is consistent" am: d8c3cae95f
am: 31229c03ae

Change-Id: I034e496238cd833002a4fd9bd3d96364624ee03e