Merge changes Id437e220,I9d6b3fba am: 94b6d11640 am: 8a7aa6197d am: ffb306c748
authorKenneth Graunke <kenneth.w.graunke@intel.com>
Mon, 11 Sep 2017 20:01:51 +0000 (20:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Sep 2017 20:01:51 +0000 (20:01 +0000)
am: 7315580588

Change-Id: I58adea4923d51c74b3875e33d88e7a8b9d37b55c


Trivial merge