Merge "Merge "Try to determine renderable format in lifetime tests am: c0a5dc217f...
authorPyry Haulos <phaulos@google.com>
Wed, 3 May 2017 16:16:50 +0000 (16:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 3 May 2017 16:16:50 +0000 (16:16 +0000)
am: 3498ef1536

Change-Id: Id8758cffe0b5d09afdb52db8e41e697156896706


Trivial merge