Update Android CTS mustpass am: df293b49cd am: 41db7dc40e
authorPyry Haulos <phaulos@google.com>
Wed, 27 Jul 2016 17:03:21 +0000 (17:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 27 Jul 2016 17:03:21 +0000 (17:03 +0000)
am: af4a755613

Change-Id: I6ce141f02caded2c299db158e5ee4a093874fa3f


Trivial merge