Merge "Merge "Try to determine renderable format in lifetime tests am: c0a5dc217f...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Wed, 3 May 2017 16:16:31 +0000 (16:16 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 3 May 2017 16:16:31 +0000 (16:16 +0000)

Trivial merge