This change was already submitted with https://android-review.git.corp.google.com/q/topic:%22revert-2713677-revert-2655262-move_java_api_libraries-JTESUMBERD-FPSEKJYXCE%22 but was never propagated to downstream. Ignore-AOSP-First: change already merged in aosp Test: m nothing --build-from-text-stub Merged-In: If66b5bba719bb389a69f2353d2218a89b2b96b90 Change-Id: Ia6867e8e4f8f57a2bbb0b763e7e11c7a6a76fdfd