-Werror,-Wreorder

Change-Id: Iff7837eb1390ddcf9e281912d7d91f76e8daf221