Merge cherrypicks of ['googleplex-android-review.googlesource.com/25568801'] into udc-d2-release.

Change-Id: Ia2041597a261a2f734635e3009608aeaaa3c88aa

Author: Android Build Coastguard Worker

tests/camera/Android.bp

@@ -56,6 +56,7 @@ android_test {
     // Include both the 32 and 64 bit versions
     compile_multilib: "both",
     static_libs: [
+        "collector-device-lib-platform",
         "compatibility-device-util-axt",
         "ctstestrunner-axt",
         "cts-hardware-lib",