Merge remote-tracking branch 'pmaydell/armhw-for-upstream' into staging