Revert "Fix various c++11 narrowing violations"

This breaks rambar in recents.

This reverts commit 0d3c6612ef97d19fa908a5dbe6023245fb316950.

Change-Id: Ib1900496c28e3a164d39f2cddf129e85a6382333
Merge "Revert "Fix various c++11 narrowing violations"" into jb43