am bea91cfd: Merge "Really disable IPv6 RA processing in dhcpcd."

* commit 'bea91cfdd43d843cdda5ce473d84b7cfcdd566ec':
  Really disable IPv6 RA processing in dhcpcd.
diff --git a/android.conf b/android.conf
index bde048c..5f5fd54 100755
--- a/android.conf
+++ b/android.conf
@@ -1,6 +1,9 @@
 # dhcpcd configuration for Android Wi-Fi interface
 # See dhcpcd.conf(5) for details.
 
+# IPv6 RS/RA processing is handled by the kernel. See also http://b/15268738
+noipv6rs
+
 interface wlan0
 # dhcpcd-run-hooks uses these options.
 option subnet_mask, routers, domain_name_servers, domain_name, domain_search