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

Change-Id: I01a4ee7ce7fcdbe98730280e9263a5a55926c60c