Merge QP1A.190122.001

Change-Id: Ie9ddb1fd9933b6718f045a153676d4d126d338e0

core/src/main/java/Android.bp

+// Build the client static library for the Google Services Framework
+java_library {
+    name: "oauth",
+    srcs: ["net/**/*.java"],
+    sdk_version: "8",
+}

core/src/main/java/Android.mk

-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-# This will build the client static library for the Google Services Framework
-LOCAL_MODULE := oauth
-
-# Includes all the java files, and explicitly declares any aidl files
-LOCAL_SRC_FILES := \
-   $(call all-java-files-under, net)
-
-LOCAL_SDK_VERSION := 8
-
-# Build the actual static library
-include $(BUILD_STATIC_JAVA_LIBRARY)