diff --git a/doc/history.adoc b/doc/history.adoc
index 9acf446..e8d3227 100644
--- a/doc/history.adoc
+++ b/doc/history.adoc
@@ -14,6 +14,7 @@ http://www.boost.org/LICENSE_1_0.txt)
 * Convert documentation to AsciiDoctor format.
 * Document correct versions for C++ standard.
 * Fix compile error from not available header when building in WinCE.
+* Remove deprecated `BOOST_OS_ANDROID`.
 
 == 1.10
 
diff --git a/doc/index.html b/doc/index.html
index 9d3276d..6bfc9d6 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -563,28 +563,27 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <ul class="sectlevel3">
 <li><a href="#_boost_os_aix">4.5.1. <code>BOOST_OS_AIX</code></a></li>
 <li><a href="#_boost_os_amigaos">4.5.2. <code>BOOST_OS_AMIGAOS</code></a></li>
-<li><a href="#_boost_os_android">4.5.3. <code>BOOST_OS_ANDROID</code></a></li>
-<li><a href="#_boost_os_beos">4.5.4. <code>BOOST_OS_BEOS</code></a></li>
-<li><a href="#_boost_os_bsd">4.5.5. <code>BOOST_OS_BSD</code></a></li>
-<li><a href="#_boost_os_cygwin">4.5.6. <code>BOOST_OS_CYGWIN</code></a></li>
-<li><a href="#_boost_os_haiku">4.5.7. <code>BOOST_OS_HAIKU</code></a></li>
-<li><a href="#_boost_os_hpux">4.5.8. <code>BOOST_OS_HPUX</code></a></li>
-<li><a href="#_boost_os_ios">4.5.9. <code>BOOST_OS_IOS</code></a></li>
-<li><a href="#_boost_os_irix">4.5.10. <code>BOOST_OS_IRIX</code></a></li>
-<li><a href="#_boost_os_linux">4.5.11. <code>BOOST_OS_LINUX</code></a></li>
-<li><a href="#_boost_os_macos">4.5.12. <code>BOOST_OS_MACOS</code></a></li>
-<li><a href="#_boost_os_os400">4.5.13. <code>BOOST_OS_OS400</code></a></li>
-<li><a href="#_boost_os_qnx">4.5.14. <code>BOOST_OS_QNX</code></a></li>
-<li><a href="#_boost_os_solaris">4.5.15. <code>BOOST_OS_SOLARIS</code></a></li>
-<li><a href="#_boost_os_unix">4.5.16. <code>BOOST_OS_UNIX</code></a></li>
-<li><a href="#_boost_os_svr4">4.5.17. <code>BOOST_OS_SVR4</code></a></li>
-<li><a href="#_boost_os_vms">4.5.18. <code>BOOST_OS_VMS</code></a></li>
-<li><a href="#_boost_os_windows">4.5.19. <code>BOOST_OS_WINDOWS</code></a></li>
-<li><a href="#_boost_os_bsd_bsdi">4.5.20. <code>BOOST_OS_BSD_BSDI</code></a></li>
-<li><a href="#_boost_os_bsd_dragonfly">4.5.21. <code>BOOST_OS_BSD_DRAGONFLY</code></a></li>
-<li><a href="#_boost_os_bsd_free">4.5.22. <code>BOOST_OS_BSD_FREE</code></a></li>
-<li><a href="#_boost_os_bsd_net">4.5.23. <code>BOOST_OS_BSD_NET</code></a></li>
-<li><a href="#_boost_os_bsd_open">4.5.24. <code>BOOST_OS_BSD_OPEN</code></a></li>
+<li><a href="#_boost_os_beos">4.5.3. <code>BOOST_OS_BEOS</code></a></li>
+<li><a href="#_boost_os_bsd">4.5.4. <code>BOOST_OS_BSD</code></a></li>
+<li><a href="#_boost_os_cygwin">4.5.5. <code>BOOST_OS_CYGWIN</code></a></li>
+<li><a href="#_boost_os_haiku">4.5.6. <code>BOOST_OS_HAIKU</code></a></li>
+<li><a href="#_boost_os_hpux">4.5.7. <code>BOOST_OS_HPUX</code></a></li>
+<li><a href="#_boost_os_ios">4.5.8. <code>BOOST_OS_IOS</code></a></li>
+<li><a href="#_boost_os_irix">4.5.9. <code>BOOST_OS_IRIX</code></a></li>
+<li><a href="#_boost_os_linux">4.5.10. <code>BOOST_OS_LINUX</code></a></li>
+<li><a href="#_boost_os_macos">4.5.11. <code>BOOST_OS_MACOS</code></a></li>
+<li><a href="#_boost_os_os400">4.5.12. <code>BOOST_OS_OS400</code></a></li>
+<li><a href="#_boost_os_qnx">4.5.13. <code>BOOST_OS_QNX</code></a></li>
+<li><a href="#_boost_os_solaris">4.5.14. <code>BOOST_OS_SOLARIS</code></a></li>
+<li><a href="#_boost_os_unix">4.5.15. <code>BOOST_OS_UNIX</code></a></li>
+<li><a href="#_boost_os_svr4">4.5.16. <code>BOOST_OS_SVR4</code></a></li>
+<li><a href="#_boost_os_vms">4.5.17. <code>BOOST_OS_VMS</code></a></li>
+<li><a href="#_boost_os_windows">4.5.18. <code>BOOST_OS_WINDOWS</code></a></li>
+<li><a href="#_boost_os_bsd_bsdi">4.5.19. <code>BOOST_OS_BSD_BSDI</code></a></li>
+<li><a href="#_boost_os_bsd_dragonfly">4.5.20. <code>BOOST_OS_BSD_DRAGONFLY</code></a></li>
+<li><a href="#_boost_os_bsd_free">4.5.21. <code>BOOST_OS_BSD_FREE</code></a></li>
+<li><a href="#_boost_os_bsd_net">4.5.22. <code>BOOST_OS_BSD_NET</code></a></li>
+<li><a href="#_boost_os_bsd_open">4.5.23. <code>BOOST_OS_BSD_OPEN</code></a></li>
 </ul>
 </li>
 <li><a href="#_boost_plat_platform_macros">4.6. <code>BOOST_PLAT</code> platform macros</a>
@@ -3630,10 +3629,20 @@ Specifically the defined versions are:</p>
 <td class="tableblock halign-left valign-top"><p class="tableblock">ISO/IEC 14882:1998</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">41.12.1</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">41.3.1</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">2011</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">ISO/IEC 14882:2011</p></td>
 </tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">44.2.1</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">2014</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">ISO/IEC 14882:2014</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">47.3.1</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">2017</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">ISO/IEC 14882:2017</p></td>
+</tr>
 </tbody>
 </table>
 <table class="tableblock frame-all grid-all stretch">
@@ -4267,44 +4276,7 @@ Version number available as major, minor, and patch.</p>
 </table>
 </div>
 <div class="sect3">
-<h4 id="_boost_os_android"><a class="anchor" href="#_boost_os_android"></a>4.5.3. <code>BOOST_OS_ANDROID</code></h4>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<div class="title">ℹ</div>
-</td>
-<td class="content">
-<code>BOOST_OS_ANDROID</code> is deprecated, and will be removed in a following release.
-Please use <code>BOOST_PLAT_ANDROID</code> instead.
-</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p><a href="http://en.wikipedia.org/wiki/Android_%28operating_system%29">Android</a> operating system.</p>
-</div>
-<table class="tableblock frame-all grid-all stretch">
-<colgroup>
-<col style="width: 50%;">
-<col style="width: 50%;">
-</colgroup>
-<thead>
-<tr>
-<th class="tableblock halign-left valign-top">Symbol</th>
-<th class="tableblock halign-left valign-top">Version</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>__ANDROID__</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><strong>detection</strong></p></td>
-</tr>
-</tbody>
-</table>
-</div>
-<div class="sect3">
-<h4 id="_boost_os_beos"><a class="anchor" href="#_boost_os_beos"></a>4.5.4. <code>BOOST_OS_BEOS</code></h4>
+<h4 id="_boost_os_beos"><a class="anchor" href="#_boost_os_beos"></a>4.5.3. <code>BOOST_OS_BEOS</code></h4>
 <div class="paragraph">
 <p><a href="http://en.wikipedia.org/wiki/BeOS">BeOS</a> operating system.</p>
 </div>
@@ -4328,7 +4300,7 @@ Please use <code>BOOST_PLAT_ANDROID</code> instead.
 </table>
 </div>
 <div class="sect3">
-<h4 id="_boost_os_bsd"><a class="anchor" href="#_boost_os_bsd"></a>4.5.5. <code>BOOST_OS_BSD</code></h4>
+<h4 id="_boost_os_bsd"><a class="anchor" href="#_boost_os_bsd"></a>4.5.4. <code>BOOST_OS_BSD</code></h4>
 <div class="paragraph">
 <p><a href="http://en.wikipedia.org/wiki/Berkeley_Software_Distribution">BSD</a> operating system.</p>
 </div>
@@ -4409,7 +4381,7 @@ of BSD. If the above variants is detected the corresponding macro is also set.
 </table>
 </div>
 <div class="sect3">
-<h4 id="_boost_os_cygwin"><a class="anchor" href="#_boost_os_cygwin"></a>4.5.6. <code>BOOST_OS_CYGWIN</code></h4>
+<h4 id="_boost_os_cygwin"><a class="anchor" href="#_boost_os_cygwin"></a>4.5.5. <code>BOOST_OS_CYGWIN</code></h4>
 <div class="paragraph">
 <p><a href="http://en.wikipedia.org/wiki/Cygwin">Cygwin</a> evironment.</p>
 </div>
@@ -4437,7 +4409,7 @@ of BSD. If the above variants is detected the corresponding macro is also set.
 </table>
 </div>
 <div class="sect3">
-<h4 id="_boost_os_haiku"><a class="anchor" href="#_boost_os_haiku"></a>4.5.7. <code>BOOST_OS_HAIKU</code></h4>
+<h4 id="_boost_os_haiku"><a class="anchor" href="#_boost_os_haiku"></a>4.5.6. <code>BOOST_OS_HAIKU</code></h4>
 <div class="paragraph">
 <p><a href="http://en.wikipedia.org/wiki/Haiku_(operating_system)">Haiku</a> operating system.</p>
 </div>
@@ -4461,7 +4433,7 @@ of BSD. If the above variants is detected the corresponding macro is also set.
 </table>
 </div>
 <div class="sect3">
-<h4 id="_boost_os_hpux"><a class="anchor" href="#_boost_os_hpux"></a>4.5.8. <code>BOOST_OS_HPUX</code></h4>
+<h4 id="_boost_os_hpux"><a class="anchor" href="#_boost_os_hpux"></a>4.5.7. <code>BOOST_OS_HPUX</code></h4>
 <div class="paragraph">
 <p><a href="http://en.wikipedia.org/wiki/HP-UX">HP-UX</a> operating system.</p>
 </div>
@@ -4493,7 +4465,7 @@ of BSD. If the above variants is detected the corresponding macro is also set.
 </table>
 </div>
 <div class="sect3">
-<h4 id="_boost_os_ios"><a class="anchor" href="#_boost_os_ios"></a>4.5.9. <code>BOOST_OS_IOS</code></h4>
+<h4 id="_boost_os_ios"><a class="anchor" href="#_boost_os_ios"></a>4.5.8. <code>BOOST_OS_IOS</code></h4>
 <div class="paragraph">
 <p><a href="http://en.wikipedia.org/wiki/iOS">iOS</a> operating system.</p>
 </div>
@@ -4529,7 +4501,7 @@ of BSD. If the above variants is detected the corresponding macro is also set.
 </table>
 </div>
 <div class="sect3">
-<h4 id="_boost_os_irix"><a class="anchor" href="#_boost_os_irix"></a>4.5.10. <code>BOOST_OS_IRIX</code></h4>
+<h4 id="_boost_os_irix"><a class="anchor" href="#_boost_os_irix"></a>4.5.9. <code>BOOST_OS_IRIX</code></h4>
 <div class="paragraph">
 <p><a href="http://en.wikipedia.org/wiki/Irix">IRIX</a> operating system.</p>
 </div>
@@ -4557,7 +4529,7 @@ of BSD. If the above variants is detected the corresponding macro is also set.
 </table>
 </div>
 <div class="sect3">
-<h4 id="_boost_os_linux"><a class="anchor" href="#_boost_os_linux"></a>4.5.11. <code>BOOST_OS_LINUX</code></h4>
+<h4 id="_boost_os_linux"><a class="anchor" href="#_boost_os_linux"></a>4.5.10. <code>BOOST_OS_LINUX</code></h4>
 <div class="paragraph">
 <p><a href="http://en.wikipedia.org/wiki/Linux">Linux</a> operating system.</p>
 </div>
@@ -4593,7 +4565,7 @@ of BSD. If the above variants is detected the corresponding macro is also set.
 </table>
 </div>
 <div class="sect3">
-<h4 id="_boost_os_macos"><a class="anchor" href="#_boost_os_macos"></a>4.5.12. <code>BOOST_OS_MACOS</code></h4>
+<h4 id="_boost_os_macos"><a class="anchor" href="#_boost_os_macos"></a>4.5.11. <code>BOOST_OS_MACOS</code></h4>
 <div class="paragraph">
 <p><a href="http://en.wikipedia.org/wiki/Mac_OS">Mac OS</a> operating system.</p>
 </div>
@@ -4637,7 +4609,7 @@ of BSD. If the above variants is detected the corresponding macro is also set.
 </table>
 </div>
 <div class="sect3">
-<h4 id="_boost_os_os400"><a class="anchor" href="#_boost_os_os400"></a>4.5.13. <code>BOOST_OS_OS400</code></h4>
+<h4 id="_boost_os_os400"><a class="anchor" href="#_boost_os_os400"></a>4.5.12. <code>BOOST_OS_OS400</code></h4>
 <div class="paragraph">
 <p><a href="http://en.wikipedia.org/wiki/IBM_i">IBM OS/400</a> operating system.</p>
 </div>
@@ -4661,7 +4633,7 @@ of BSD. If the above variants is detected the corresponding macro is also set.
 </table>
 </div>
 <div class="sect3">
-<h4 id="_boost_os_qnx"><a class="anchor" href="#_boost_os_qnx"></a>4.5.14. <code>BOOST_OS_QNX</code></h4>
+<h4 id="_boost_os_qnx"><a class="anchor" href="#_boost_os_qnx"></a>4.5.13. <code>BOOST_OS_QNX</code></h4>
 <div class="paragraph">
 <p><a href="http://en.wikipedia.org/wiki/QNX">QNX</a> operating system.
 Version number available as major, and minor if possible. And
@@ -4699,7 +4671,7 @@ version 4 is specifically detected.</p>
 </table>
 </div>
 <div class="sect3">
-<h4 id="_boost_os_solaris"><a class="anchor" href="#_boost_os_solaris"></a>4.5.15. <code>BOOST_OS_SOLARIS</code></h4>
+<h4 id="_boost_os_solaris"><a class="anchor" href="#_boost_os_solaris"></a>4.5.14. <code>BOOST_OS_SOLARIS</code></h4>
 <div class="paragraph">
 <p><a href="http://en.wikipedia.org/wiki/Solaris_Operating_Environment">Solaris</a> operating system.</p>
 </div>
@@ -4727,7 +4699,7 @@ version 4 is specifically detected.</p>
 </table>
 </div>
 <div class="sect3">
-<h4 id="_boost_os_unix"><a class="anchor" href="#_boost_os_unix"></a>4.5.16. <code>BOOST_OS_UNIX</code></h4>
+<h4 id="_boost_os_unix"><a class="anchor" href="#_boost_os_unix"></a>4.5.15. <code>BOOST_OS_UNIX</code></h4>
 <div class="paragraph">
 <p><a href="http://en.wikipedia.org/wiki/Unix">Unix Environment</a> operating system.</p>
 </div>
@@ -4763,7 +4735,7 @@ version 4 is specifically detected.</p>
 </table>
 </div>
 <div class="sect3">
-<h4 id="_boost_os_svr4"><a class="anchor" href="#_boost_os_svr4"></a>4.5.17. <code>BOOST_OS_SVR4</code></h4>
+<h4 id="_boost_os_svr4"><a class="anchor" href="#_boost_os_svr4"></a>4.5.16. <code>BOOST_OS_SVR4</code></h4>
 <div class="paragraph">
 <p><a href="http://en.wikipedia.org/wiki/UNIX_System_V">SVR4 Environment</a> operating system.</p>
 </div>
@@ -4799,7 +4771,7 @@ version 4 is specifically detected.</p>
 </table>
 </div>
 <div class="sect3">
-<h4 id="_boost_os_vms"><a class="anchor" href="#_boost_os_vms"></a>4.5.18. <code>BOOST_OS_VMS</code></h4>
+<h4 id="_boost_os_vms"><a class="anchor" href="#_boost_os_vms"></a>4.5.17. <code>BOOST_OS_VMS</code></h4>
 <div class="paragraph">
 <p><a href="http://en.wikipedia.org/wiki/Vms">VMS</a> operating system.</p>
 </div>
@@ -4831,7 +4803,7 @@ version 4 is specifically detected.</p>
 </table>
 </div>
 <div class="sect3">
-<h4 id="_boost_os_windows"><a class="anchor" href="#_boost_os_windows"></a>4.5.19. <code>BOOST_OS_WINDOWS</code></h4>
+<h4 id="_boost_os_windows"><a class="anchor" href="#_boost_os_windows"></a>4.5.18. <code>BOOST_OS_WINDOWS</code></h4>
 <div class="paragraph">
 <p><a href="http://en.wikipedia.org/wiki/Category:Microsoft_Windows">Microsoft Windows</a> operating system.</p>
 </div>
@@ -4871,7 +4843,7 @@ version 4 is specifically detected.</p>
 </table>
 </div>
 <div class="sect3">
-<h4 id="_boost_os_bsd_bsdi"><a class="anchor" href="#_boost_os_bsd_bsdi"></a>4.5.20. <code>BOOST_OS_BSD_BSDI</code></h4>
+<h4 id="_boost_os_bsd_bsdi"><a class="anchor" href="#_boost_os_bsd_bsdi"></a>4.5.19. <code>BOOST_OS_BSD_BSDI</code></h4>
 <div class="paragraph">
 <p><a href="http://en.wikipedia.org/wiki/BSD/OS">BSDi BSD/OS</a> operating system.</p>
 </div>
@@ -4895,7 +4867,7 @@ version 4 is specifically detected.</p>
 </table>
 </div>
 <div class="sect3">
-<h4 id="_boost_os_bsd_dragonfly"><a class="anchor" href="#_boost_os_bsd_dragonfly"></a>4.5.21. <code>BOOST_OS_BSD_DRAGONFLY</code></h4>
+<h4 id="_boost_os_bsd_dragonfly"><a class="anchor" href="#_boost_os_bsd_dragonfly"></a>4.5.20. <code>BOOST_OS_BSD_DRAGONFLY</code></h4>
 <div class="paragraph">
 <p><a href="http://en.wikipedia.org/wiki/DragonFly_BSD">DragonFly BSD</a> operating system.</p>
 </div>
@@ -4919,7 +4891,7 @@ version 4 is specifically detected.</p>
 </table>
 </div>
 <div class="sect3">
-<h4 id="_boost_os_bsd_free"><a class="anchor" href="#_boost_os_bsd_free"></a>4.5.22. <code>BOOST_OS_BSD_FREE</code></h4>
+<h4 id="_boost_os_bsd_free"><a class="anchor" href="#_boost_os_bsd_free"></a>4.5.21. <code>BOOST_OS_BSD_FREE</code></h4>
 <div class="paragraph">
 <p><a href="http://en.wikipedia.org/wiki/Freebsd">FreeBSD</a> operating system.</p>
 </div>
@@ -4947,7 +4919,7 @@ version 4 is specifically detected.</p>
 </table>
 </div>
 <div class="sect3">
-<h4 id="_boost_os_bsd_net"><a class="anchor" href="#_boost_os_bsd_net"></a>4.5.23. <code>BOOST_OS_BSD_NET</code></h4>
+<h4 id="_boost_os_bsd_net"><a class="anchor" href="#_boost_os_bsd_net"></a>4.5.22. <code>BOOST_OS_BSD_NET</code></h4>
 <div class="paragraph">
 <p><a href="http://en.wikipedia.org/wiki/Netbsd">NetBSD</a> operating system.</p>
 </div>
@@ -4995,7 +4967,7 @@ version 4 is specifically detected.</p>
 </table>
 </div>
 <div class="sect3">
-<h4 id="_boost_os_bsd_open"><a class="anchor" href="#_boost_os_bsd_open"></a>4.5.24. <code>BOOST_OS_BSD_OPEN</code></h4>
+<h4 id="_boost_os_bsd_open"><a class="anchor" href="#_boost_os_bsd_open"></a>4.5.23. <code>BOOST_OS_BSD_OPEN</code></h4>
 <div class="paragraph">
 <p><a href="http://en.wikipedia.org/wiki/Openbsd">OpenBSD</a> operating system.</p>
 </div>
@@ -6765,6 +6737,15 @@ expressions. It defaults to "c++", but can be any of: "c", "cpp",
 <li>
 <p>Convert documentation to AsciiDoctor format.</p>
 </li>
+<li>
+<p>Document correct versions for C++ standard.</p>
+</li>
+<li>
+<p>Fix compile error from not available header when building in WinCE.</p>
+</li>
+<li>
+<p>Remove deprecated <code>BOOST_OS_ANDROID</code>.</p>
+</li>
 </ul>
 </div>
 </div>
diff --git a/doc/predef.adoc b/doc/predef.adoc
index a04c2bd..7249f5f 100644
--- a/doc/predef.adoc
+++ b/doc/predef.adoc
@@ -724,8 +724,6 @@ include::../include/boost/predef/os/aix.h[tag=reference]
 
 include::../include/boost/predef/os/amigaos.h[tag=reference]
 
-include::../include/boost/predef/os/android.h[tag=reference]
-
 include::../include/boost/predef/os/beos.h[tag=reference]
 
 include::../include/boost/predef/os/bsd.h[tag=reference]
diff --git a/include/boost/predef/os.h b/include/boost/predef/os.h
index 9a9f9c6..da28e1c 100644
--- a/include/boost/predef/os.h
+++ b/include/boost/predef/os.h
@@ -29,6 +29,4 @@ http://www.boost.org/LICENSE_1_0.txt)
 #include <boost/predef/os/vms.h>
 #include <boost/predef/os/windows.h>
 
-#include <boost/predef/os/android.h>
-
 #endif
diff --git a/include/boost/predef/os/android.h b/include/boost/predef/os/android.h
deleted file mode 100644
index 99a1cd0..0000000
--- a/include/boost/predef/os/android.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-Copyright Rene Rivera 2015
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE_1_0.txt or copy at
-http://www.boost.org/LICENSE_1_0.txt)
-*/
-
-#ifndef BOOST_PREDEF_OS_ANDROID_H
-#define BOOST_PREDEF_OS_ANDROID_H
-
-#include <boost/predef/version_number.h>
-#include <boost/predef/make.h>
-
-/* tag::reference[]
-= `BOOST_OS_ANDROID`
-
-NOTE: `BOOST_OS_ANDROID` is deprecated, and will be removed in a following release.
-Please use `BOOST_PLAT_ANDROID` instead.
-
-http://en.wikipedia.org/wiki/Android_%28operating_system%29[Android] operating system.
-
-[options="header"]
-|===
-| {predef_symbol} | {predef_version}
-
-| `+__ANDROID__+` | {predef_detection}
-|===
-*/ // end::reference[]
-
-#define BOOST_OS_ANDROID BOOST_VERSION_NUMBER_NOT_AVAILABLE
-
-#if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \
-    defined(__ANDROID__) \
-    )
-#   undef BOOST_OS_ANDROID
-#   define BOOST_OS_ANDROID BOOST_VERSION_NUMBER_AVAILABLE
-#endif
-
-#if BOOST_OS_ANDROID
-#   define BOOST_OS_ANDROID_AVAILABLE
-#   include <boost/predef/detail/os_detected.h>
-#endif
-
-#define BOOST_OS_ANDROID_NAME "Android"
-
-#endif
-
-#include <boost/predef/detail/test.h>
-BOOST_PREDEF_DECLARE_TEST(BOOST_OS_ANDROID,BOOST_OS_ANDROID_NAME)
diff --git a/include/boost/predef/other/endian.h b/include/boost/predef/other/endian.h
index a8c6abe..0281e4a 100644
--- a/include/boost/predef/other/endian.h
+++ b/include/boost/predef/other/endian.h
@@ -13,7 +13,7 @@ http://www.boost.org/LICENSE_1_0.txt)
 #include <boost/predef/library/c/gnu.h>
 #include <boost/predef/os/macos.h>
 #include <boost/predef/os/bsd.h>
-#include <boost/predef/os/android.h>
+#include <boost/predef/platform/android.h>
 
 /* tag::reference[]
 = `BOOST_ENDIAN_*`
@@ -54,7 +54,7 @@ information and acquired knowledge:
  */
 #if !BOOST_ENDIAN_BIG_BYTE && !BOOST_ENDIAN_BIG_WORD && \
     !BOOST_ENDIAN_LITTLE_BYTE && !BOOST_ENDIAN_LITTLE_WORD
-#   if BOOST_LIB_C_GNU || BOOST_OS_ANDROID
+#   if BOOST_LIB_C_GNU || BOOST_PLAT_ANDROID
 #       include <endian.h>
 #   else
 #       if BOOST_OS_MACOS