Reland#2 Use Aapt2 for final apk resource packaging

This reverts commit c63b9f73.

Reason for reland: Fix non-determinism in aapt2 resources.asrc output

TBR=agrieve@chromium.org

Bug: 782316
Change-Id: Iea2d6f63874a40a40084abd880ee5462b1e51de8
Reviewed-on: https://chromium-review.googlesource.com/830766
Commit-Queue: agrieve <agrieve@chromium.org>
Reviewed-by: agrieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#525252}

base/android/jni_generator/AndroidManifest.xml

+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright 2017 The Chromium Authors. All rights reserved.  Use of this source
+  code is governed by a BSD-style license that can be found in the LICENSE
+  file.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.jni.generator">
+
+    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="24" />
+    <application></application>
+
+</manifest>

base/android/jni_generator/BUILD.gn

@@ -64,7 +64,7 @@ shared_library("jni_sample_lib") {
 
 android_apk("sample_jni_apk") {
   apk_name = "SampleJni"
-  android_manifest = "//build/android/AndroidManifest.xml"
+  android_manifest = "AndroidManifest.xml"
   deps = [
     ":jni_sample_java",
     "//base:base_java",

build/android/pylib/instrumentation/instrumentation_test_instance.py

@@ -568,10 +568,10 @@ class InstrumentationTestInstance(test_instance.TestInstance):
     self._test_package = self._test_apk.GetPackageName()
     all_instrumentations = self._test_apk.GetAllInstrumentations()
     all_junit3_runner_classes = [
-        x for x in all_instrumentations if ('true' not in x.get(
+        x for x in all_instrumentations if ('0xffffffff' not in x.get(
             'chromium-junit4', ''))]
     all_junit4_test_runner_classes = [
-        x for x in all_instrumentations if ('true' in x.get(
+        x for x in all_instrumentations if ('0xffffffff' in x.get(
             'chromium-junit4', ''))]
 
     if len(all_junit3_runner_classes) > 1:

chrome/android/java/res/layout/data_reduction_main_menu_item.xml

@@ -25,7 +25,7 @@
 
         <ImageView
             android:id="@+id/chart_icon"
-            android:src="@+drawable/data_reduction_main_menu_icon"
+            android:src="@drawable/data_reduction_main_menu_icon"
             android:layout_width="@dimen/data_reduction_main_menu_icon_width"
             android:layout_height="match_parent"
             android:layout_gravity="start|center_vertical"

testing/android/empty_apk/AndroidManifest.xml

@@ -5,4 +5,5 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="{{package}}">
+  <application></application>
 </manifest>