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

Change-Id: I1f59cdea6f072ac588e574f77d0bfb21034f913b