Merge "Merge "Merge "Try to determine renderable format in lifetime tests am: c0a5dc2...
authorPyry Haulos <phaulos@google.com>
Thu, 24 Aug 2017 17:48:41 +0000 (17:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 24 Aug 2017 17:48:41 +0000 (17:48 +0000)
am: 12c6adf6f9

Change-Id: I3e2f493da464dbf0f3ba59de5d842a61a66b233d


Trivial merge