Merge changes from topic "hidl-test"
authorSteven Moreland <smoreland@google.com>
Sun, 15 Oct 2017 02:57:18 +0000 (02:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sun, 15 Oct 2017 02:57:18 +0000 (02:57 +0000)
am: 240f9e1476

Change-Id: Iff52448e0f4f522d5c5cbd59efbd1a734bc95570


Trivial merge