Merge "liblog: Assure shifting behavior is consistent" am: d8c3cae95f am: e8528b92e1
am: 80479914dc

Change-Id: Iaf6cb8389978625371cd227db04e9bdfa779885f