Merge "libhardware: fix -Wreorder-init-list"
am: b833bfbd5f

Change-Id: I6cfaf4a0d191295386f70d508210178b6b5f16a5