Merge pi-platform-release to stage-aosp-master - DO NOT MERGE

Change-Id: I8f33b4d8c549059685ef02d175a23df06fcf496c
diff --git a/tests/robotests/Android.mk b/tests/robotests/Android.mk
index bfc6dc0..89b6484 100644
--- a/tests/robotests/Android.mk
+++ b/tests/robotests/Android.mk
@@ -13,8 +13,7 @@
 
 LOCAL_JAVA_LIBRARIES := \
     junit \
-    platform-robolectric-3.6.1-prebuilt \
-    sdk_vcurrent
+    platform-robolectric-3.6.2-prebuilt
 
 LOCAL_INSTRUMENTATION_FOR := CarMessengerApp
 LOCAL_MODULE := CarMessengerRoboTests
@@ -39,4 +38,4 @@
 
 LOCAL_INSTRUMENT_SOURCE_DIRS := $(dir $(LOCAL_PATH))../src
 
-include prebuilts/misc/common/robolectric/3.6.1/run_robotests.mk
\ No newline at end of file
+include prebuilts/misc/common/robolectric/3.6.2/run_robotests.mk