merge in master-release history after reset to master
AAQ15
AAQ15B
merge in master-release history after reset to master
AAQ16
merge in master-release history after reset to master
AAQ52
merge in master-release history after reset to master
AAQ53
Support build rules which generate .o files.

webviewchromium has some build rules which use a custom tool to create
.o files from other input (i.e. they are not prebuilt and so can't be
included in LOCAL_PREBUILT_OBJ_FILES). Support adding .o files to
LOCAL_GENERATED_SOURCES and doing the right thing with them (including
them in the static/dynamic library or executable being built).

Bug: 7714333

Change-Id: I3b1d29eeff30aebeafe33398f9bef2eb6972d997
merge in master-release history after reset to master
AAQ56
am 4dbbd8a3: am 757e212c: am 0426da29: Merge "Fixed error message for using OpenJDK."

* commit '4dbbd8a37efb93922bc7bc62f341fd29d739383e':
  Fixed error message for using OpenJDK.
am 48b6e18f: Merge "Build rs_compatibility_jni_libs into product-specific dir" into jb-mr2-dev

* commit '48b6e18f1f27ca57c89879c00fae516243231354':
  Build rs_compatibility_jni_libs into product-specific dir
am f7084ca9: Run zipalign after classes.dex is removed from the apk

* commit 'f7084ca9218b35b41523d7fb0926a8773ecf2ef4':
  Run zipalign after classes.dex is removed from the apk
am 9c1954c4: am 31428917: am 93cdbd0b: Merge "Run zipalign after classes.dex is removed from the apk"

* commit '9c1954c43ab21994ed33198750b2551a1646a295':
  Run zipalign after classes.dex is removed from the apk
am b9d22596: Merge "Use DEPENDENCIES_ON_SHARED_LIBRARIES" into jb-mr2-dev

* commit 'b9d22596a87c438cb5a2f4bdbdc1026ce7601e0a':
  Use $(my_prefix)DEPENDENCIES_ON_SHARED_LIBRARIES
merge in master-release history after reset to master
AAQ57
am 68434ff5: am 70887ad4: am 2e639566: am 8429876f: am 7e447edf: docs: update search suggest with google services apis including some optimizations for loading javascript resources

* commit '68434ff55fe5c83ab81bb94131bda17af6377386':
  docs: update search suggest with google services apis including some optimizations for loading javascript resources