resolved conflicts for merge of 3c10f535 to jb-mr2-dev-plus-aosp

Change-Id: Id4ab035f92f2a8bf1b1fefdfd22ba370e33e7829

diff --cc Android.mk
index c8b81dc,bdc5f8b..0663e85
--- 1/Android.mk
--- 2/Android.mk
+++ b/Android.mk
@@@ -1,8 -1,8 +1,8 @@@
  LOCAL_PATH:= $(call my-dir)
  include $(CLEAR_VARS)
  
- LOCAL_JAVA_LIBRARIES := bouncycastle telephony-common
+ LOCAL_JAVA_LIBRARIES := bouncycastle conscrypt telephony-common
 -LOCAL_STATIC_JAVA_LIBRARIES := guava android-support-v4 jsr305
 +LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 android-support-v13 jsr305
  
  LOCAL_MODULE_TAGS := optional