Merge "libhardware: fix -Wreorder-init-list" am: b833bfbd5f am: 93aa2fa353
am: 8dc561977f

Change-Id: I98ccee55403bd66f8aec783c7a9f91316a31fc19