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