"LRX21U"
"LRX21V"
Merge tag 'android-5.0.0_r7' into HEAD

Android 5.0.0 release 7
Recovery: remove wiping of res folder

The rm -rf of the res folder wipes out all of the TWRP theme and
images. Remove this so that TWRP will work properly.

Change-Id: I27c372d53eaae3cc8b476a909c2d3f3fc4fcb558
build: Don't use block mode by default, allow it to be chosen

Currently this uses the same logic as backuptool (but inverted)

i.e. block mode will be disabled in all cases where backuptool is enabled
which is the current default for all Omni builds.

Block mode is not needed now, and may never be needed for custom projects,
as block mode is preparation for dm-verity, which is mostly pointless on
devices with unlocked bootloaders since the kernel already has broken
the chain of trust.

TODO:  Determine if Nexus 9 *requires* blockmode.  If it does, this
may need to be reworked to allow the device to specify blockmode.

Change-Id: I36725b44f4066a43ec7e1615bd4b072f7eb3db28
edify: fix the RunBackup function

Remove 'self.UnpackPackageDir(system/addon.d, /system/addon.d)'
since this would overwrite any existing backup script e.g. gapps

Extract functions file to /tmp to not break existing
backup script files that rely on that file beeing in /tmp

Change-Id: I16741c17f30c28f5d537c693eaf43879d08f7ac1
Merge branch 'android-5.0' of https://github.com/omnirom/android_build into android-5.0