Merge "Remove (now) unnecessary reference to core-lambda-stubs."

LOCAL_ADDITIONAL_DEPENDENCIES := $(framework_res_R_stamp)

LOCAL_NO_STANDARD_LIBRARIES := true

LOCAL_JAVA_LIBRARIES := core-oj core-libart core-lambda-stubs conscrypt okhttp core-junit bouncycastle ext

LOCAL_JAVA_LIBRARIES := core-oj core-libart conscrypt okhttp core-junit bouncycastle ext

LOCAL_STATIC_JAVA_LIBRARIES := framework-protos

LOCAL_MODULE := framework