Merge commit 'b7e1131f4a5ba090c188126c017069a0f4fb63d6' of sso://googleplex-android/platform/system/libhidl into HEAD
Change-Id: I20e7a9dd7022de7ec0649357bf040eefd1f54fb6