-Werror=reorder

Change-Id: I763b2c21f0ba62cf9343582a5a41e0dc0b744b50