Merge changes from topic "multiview"
authorPhilip Rideout <prideout@google.com>
Tue, 16 Jan 2018 20:05:39 +0000 (20:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 16 Jan 2018 20:05:39 +0000 (20:05 +0000)
am: cbc74ae174

Change-Id: I1a1e3f85f1d8373ec30ce0c1fbb1c5f726ba5223


Trivial merge