Merge changes from topic "health2-hal"
authorYifan Hong <elsk@google.com>
Fri, 6 Oct 2017 05:09:23 +0000 (05:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 6 Oct 2017 05:09:23 +0000 (05:09 +0000)
am: 116fb89f70

Change-Id: Iaf211b338d946619ec6a5daecd02ee85a4648589


Trivial merge