Import patches-unapplied version 2.487 to ubuntu/bionic-proposed

Imported using git-ubuntu import.

Changelog parent: a088e92782

New changelog entries:
  * Drop android-tools-fsutils dependency, and instead install it on
    demand for the nexus7 sub-arch. This target is no longer produced,
    thus by doing this android-tools can fall out of main to universe.

debian/changelog

@@ -1,3 +1,11 @@
+livecd-rootfs (2.487) bionic; urgency=medium
+
+  * Drop android-tools-fsutils dependency, and instead install it on
+    demand for the nexus7 sub-arch. This target is no longer produced,
+    thus by doing this android-tools can fall out of main to universe.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Mon, 11 Dec 2017 12:22:36 +0000
+
 livecd-rootfs (2.486) bionic; urgency=medium
 
   [ Michael Hudson-Doyle ]

debian/control

@@ -9,7 +9,6 @@ Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/livecd-rootfs/trunk
 Package: livecd-rootfs
 Architecture: any
 Depends: ${misc:Depends},
-         android-tools-fsutils [armhf],
          apt-utils,
          debootstrap,
          dosfstools,

live-build/auto/build

@@ -860,6 +860,7 @@ if [ "$SUBARCH" = "ac100" ] || [ "$SUBARCH" = "nexus7" ]; then
 		# roll the android rootfs images
 		mkdir -p userdata
 		mv $PREFIX.rootfs.tar.gz userdata/rootfs.tar.gz
+		apt-get -y install android-tools-fsutils
 		make_ext4fs -l 6G -s $PREFIX.ext4-$FLAVOUR userdata/
 		mv userdata/rootfs.tar.gz $PREFIX.rootfs.tar.gz
 		ln -sf "$PREFIX.ext4-$FLAVOUR" "$PREFIX.ext4"