3 files changed, 66 insertions, 8 deletions
diff --git a/en/source/build-numbers.html b/en/source/build-numbers.html
index 5b977c6b..3a7f1ee8 100644
--- a/en/source/build-numbers.html
+++ b/en/source/build-numbers.html
@@ -197,6 +197,43 @@ site:</p>
   </thead>
   <tbody>
     <tr>
+      <td>NZH54B</td>
+      <td>android-7.1.2_r27</td>
+      <td>Nougat</td>
+      <td>Pixel XL, Pixel</td>
+    </tr>
+    <tr>
+    <tr>
+      <td>NKG47M</td>
+      <td>android-7.1.2_r25</td>
+      <td>Nougat</td>
+      <td>Pixel XL, Pixel</td>
+    </tr>
+    <tr>
+      <td>NJH47D</td>
+      <td>android-7.1.2_r24</td>
+      <td>Nougat</td>
+      <td>Pixel XL, Pixel</td>
+    </tr>
+    <tr>
+      <td>NHG47O</td>
+      <td>android-7.1.2_r23</td>
+      <td>Nougat</td>
+      <td>Pixel XL, Pixel</td>
+    </tr>
+    <tr>
+      <td>N2G48B</td>
+      <td>android-7.1.2_r19</td>
+      <td>Nougat</td>
+      <td>Nexus 6P, Nexus Player, Pixel C</td>
+    </tr>
+    <tr>
+      <td>N2G47Z</td>
+      <td>android-7.1.2_r18</td>
+      <td>Nougat</td>
+      <td>Nexus 5X</td>
+    </tr>
+    <tr>
       <td>NJH47B</td>
       <td>android-7.1.2_r17</td>
       <td>Nougat</td>
@@ -293,6 +330,24 @@ site:</p>
       <td>Pixel C</td>
     </tr>
     <tr>
+      <td>N9F27F</td>
+      <td>android-7.1.1_r46</td>
+      <td>Nougat</td>
+      <td>Nexus 9 (volantis)</td>
+    </tr>
+    <tr>
+      <td>N6F27H</td>
+      <td>android-7.1.1_r45</td>
+      <td>Nougat</td>
+      <td>Nexus 6</td>
+    </tr>
+    <tr>
+      <td>N4F27I</td>
+      <td>android-7.1.1_r44</td>
+      <td>Nougat</td>
+      <td>Nexus 9 (volantisg)</td>
+    </tr>
+    <tr>
       <td>N9F27C</td>
       <td>android-7.1.1_r43</td>
       <td>Nougat</td>
diff --git a/en/source/building.html b/en/source/building.html
index aada660b..a499252d 100644
--- a/en/source/building.html
+++ b/en/source/building.html
@@ -27,10 +27,6 @@
 branches, including <code>master</code>. The basic sequence of build commands
 is as follows:</p>
 
-<p class="note"><strong>Note:</strong> If you're building Android 6.0 or later,
-please see <a href="jack.html">Compiling with Jack</a> for information on this
-new default toolchain.</p>
-
 <h2 id="obtaining-proprietary-binaries">Obtain proprietary binaries</h2>
 
 <p>AOSP cannot be used from pure source code only and requires additional
diff --git a/en/source/code-style.html b/en/source/code-style.html
index ab35a9ab..b13feb4a 100644
--- a/en/source/code-style.html
+++ b/en/source/code-style.html
@@ -23,10 +23,17 @@
 
 
 
-<p>The code styles below are strict rules, not guidelines or recommendations.
-Contributions to Android that do not adhere to these rules are generally <em>not
-accepted</em>. We recognize that not all existing code follows these rules, but
-we expect all new code to be compliant.</p>
+<p>The code styles below are strict rules for contributing Java code to the
+Android Open Source Project (AOSP).  Contributions to the Android platform that
+do not adhere to these rules are generally <em>not accepted</em>. We recognize
+that not all existing code follows these rules, but we expect all new code to
+be compliant.</p>
+
+<p class="note"><strong>Note:</strong> These rules are intended for the Android
+platform and are not required of Android app developers. App developers may
+follow the standard of their choosing, such as the <a
+href="https://google.github.io/styleguide/javaguide.html">Google Java Style
+Guide</a>.</p>
 
 <h2 id="java-language-rules">Java Language Rules</h2>
 <p>Android follows standard Java coding conventions with the additional rules