include/hw: Minor upstream integration. This updates a few headers under include/hw to get closer to upstream. Change-Id: Ib495c106c3159be78292afb2d2ba9029258dc64d