Merge "Remove unused big-endian cruft." am: c21c0ac740
am: 768a8df33d

Change-Id: Ie52fd0e104323b65d3f3d04d8db312c74c448660