Merge remote-tracking branch 'aosp/master' into merge_into_crdev

Change-Id: I62b621cd73e6a328221d078b948f99cd6e58f327
Merge "Merge remote-tracking branch 'aosp/master' into merge_into_crdev" into chromium-dev
Force software draws in AOSP

Hardware acceleration in chromium m37+ no longer works with android
Kitkat, so force disable hardware acceleration. This is for AOSP only
until L is open sourced.

Change-Id: I95ad29492d868fd5a9772fce085b2a0302bf2388
Merge "Force software draws in AOSP" into chromium-dev
Change function table assignment to allow new fields

Write the function table assignment statements to allow new fields to be
added without modifying code here. Had to make the static structs
non-const.

Change-Id: I10d38caa9817f3835c4cf0e6e9418998a5452d10
Merge "Change function table assignment to allow new fields" into chromium-dev
Merge up to 707d93c from chromium-dev.
Merge "Merge up to 707d93c from chromium-dev."
Make init command line happen early

This should happen early so that the command line is ready
by the time Chromium is switching the command line
over at the end of loadLibrary. This also fixes the problem
with the CookieManager setup path where it would not get
the command line.

Bug: 12370587
Make the WebView Java library into an APK.

Package the WebView Java code as an APK instead of a JAR. Mark this as a
multiarch app so that dexopt will be run for both architectures on a
multiarch device. Add a CleanSpec to delete the old JAR.

Bug: 16329371
Change-Id: Ic09958e965b9163ac6b597df7005dd4a05de7a56
(cherry picked from commit 9674dff549ad8358b4439abcb6cf8f86cd11b307)
Add com.android.webview to the package whitelist.

Change-Id: Iaefe1ea31e3e23cc6ae94899103ad9600af8b022
Move WebView resources to separate APK

BUG: 11505352
Change-Id: I1f601605943738dd207a6ba267063c00527565de
Include pak files in the WebView apk.

This change makes the webviewchromium.apk include the Chromium
native resource .pak files. The main reason for the complexity
of the change is the fact that the .pak files are generated by
the build system and therefore need to be copied to the target
folder before the AAPT invocation.

BUG=11505352

Change-Id: I4cca827212898460dca3d4c4c16f2e3ec5b6efc6
Generate resources before running aapt.

This adds the dependency needed to generate resources before running
AAPT on them.

Change-Id: I43787cb6c883a2b57c19b1348b684264c3b3bc0a
Generate symlinks to libwebviewchromium.so in /system/priv-app

This change declares libwebviewchromium to be treated as a JNI lib
for the webviewchromium.apk. By doing this, the build system will
create symlinks from /system/app-priv/webviewchromium/lib/...
(which is the path returned by the package manager) to the actual
libraries in /system/lib*.
Furthermore this change also declares the apk to be a multilib
target, so that both libraries get symlinked on multi-arch devices.

BUG:16403706
Change-Id: Ib02191eddf8262b2b23c3c32d07e77b33759285d
AOSP-only changes to support the WebView loading from an APK.

Change-Id: If4404d21802d6fd5a7b9d76238b4bed75fbafd32
Don't use android.internal.R for resources.

We don't want to use framework internal resources in the WebView
APK.

Change-Id: Id3c8a89a73c40902442e871033b7277ae4601fe4
Merge "Make the WebView Java library into an APK." into chromium-dev
Merge "Add com.android.webview to the package whitelist." into chromium-dev
Merge "Move WebView resources to separate APK" into chromium-dev