ref: 831d72ac5f21ea53d4a466f411fd9b6a5af605fc
parent: 7755b9dada8881660826085d8ee8d9034a5c7c53
parent: e45f4a4a4ce041615d821ba94497035c431090c6
author: Yaowu Xu <yaowu@google.com>
date: Thu Sep 26 05:19:36 EDT 2013
Merge "Revert "Align struct to 32 bytes""