Backed out 2 changesets (bug 1415298) for orphaned pattern 'assets/**' in mobile/android/app/moz.build. r=backout on a CLOSED TREE

Backed out changeset e046373e0dca (bug 1415298)
Backed out changeset 160586d66bcb (bug 1415298)

--HG--
rename : mobile/android/app/src/main/assets/example_asset.txt => mobile/android/app/assets/example_asset.txt
rename : mobile/android/app/src/main/assets/parental_controls_theme.png => mobile/android/app/assets/parental_controls_theme.png
rename : mobile/android/app/src/main/assets/publicsuffixlist => mobile/android/app/assets/publicsuffixlist

mobile/android/app/build.gradle

@@ -173,6 +173,7 @@ android {
                 if (mozconfig.substs.MOZ_ANDROID_DISTRIBUTION_DIRECTORY) {
                     srcDir "${mozconfig.substs.MOZ_ANDROID_DISTRIBUTION_DIRECTORY}/assets"
                 }
+                srcDir "${topsrcdir}/mobile/android/app/assets"
             }
         }
 
@@ -567,14 +568,3 @@ android.applicationVariants.all { variant ->
 
     assembleTask.dependsOn dumpTask
 }
-
-// Bug 1415298: make Robolectric find assets.  Fix adapted from
-// https://github.com/robolectric/robolectric/issues/2647.
-android.applicationVariants.all { variant ->
-    def productFlavor = ""
-    variant.productFlavors.each {
-        productFlavor += "${it.name.capitalize()}"
-    }
-    def buildType = "${variant.buildType.name.capitalize()}"
-    tasks["compile${productFlavor}${buildType}UnitTestSources"].dependsOn(tasks["merge${productFlavor}${buildType}Assets"])
-}

mobile/android/base/moz.build

@@ -1408,7 +1408,7 @@ ANDROID_GENERATED_RESFILES += [
 ]
 
 ANDROID_ASSETS_DIRS += [
-    '/mobile/android/app/src/main/assets',
+    '/mobile/android/app/assets',
 ]
 
 if CONFIG['MOZ_ANDROID_DISTRIBUTION_DIRECTORY']: