Merge tag 'android-5.1.1_r2' into HEAD

Android 5.1.1 release 2

Conflicts:
	default.xml

Change-Id: I165c928a083782cfda63d1647005c10d93cd3481

default.xml

@@ -15,7 +15,7 @@
            review="gerrit.omnirom.org"
            fetch="https://github.com/omnirom" />
 
-  <default revision="refs/tags/android-5.1.1_r1"
+  <default revision="refs/tags/android-5.1.1_r2"
            remote="aosp"
            sync-c="true"
            sync-j="4" />