resolve merge conflicts of 4a5bcd6f to stage-aosp-master am: 3a7443d79d am: 6890bab6d9

am: e839b247f8

Change-Id: Ic3d133e2d10255f4ffdf486642b15a7ece37aec9

20 files changed, 68 insertions, 206 deletions

diff --git a/en/devices/camera/camera3_requests_methods.html b/en/devices/camera/camera3_requests_methods.html
index 55c0db6b..edd4dfe5 100644
--- a/en/devices/camera/camera3_requests_methods.html
+++ b/en/devices/camera/camera3_requests_methods.html
@@ -57,7 +57,7 @@ returned by the HAL through the <code>process_capture_result()</code> call. This
   it needs to retain for the capture processing. The HAL is responsible for
   waiting on and closing the buffers' fences and returning the buffer handles to
   the framework.</p>
-  The HAL must write the file descriptor for the input buffer's release sync fence
+<p>The HAL must write the file descriptor for the input buffer's release sync fence
   into <code>input_buffer</code>-&gt;<code>release_fence</code>, if <code>input_buffer</code> is not <code>NULL</code>. If the HAL
   returns <code>-1</code> for the input buffer release sync fence, the framework is free to
   immediately reuse the input buffer. Otherwise, the framework will wait on the
diff --git a/en/devices/graphics/implement-vulkan.html b/en/devices/graphics/implement-vulkan.html
index 918343e1..b2a5c283 100644
--- a/en/devices/graphics/implement-vulkan.html
+++ b/en/devices/graphics/implement-vulkan.html
@@ -80,12 +80,10 @@ image is built. The loader uses the existing HAL mechanism (see <code><a href="h
 for discovering and loading the driver. Preferred paths for 32-bit and 64-bit
 Vulkan drivers are:</p>
 
-<p>
 <pre class="devsite-click-to-copy">
 /vendor/lib/hw/vulkan.&lt;ro.product.platform&gt;.so
 /vendor/lib64/hw/vulkan.&lt;ro.product.platform&gt;.so
 </pre>
-</p>
 
 <p>Where &lt;<code>ro.product.platform</code>&gt; is replaced by the value of
 the system property of that name. For details and supported alternative
@@ -175,7 +173,6 @@ implementation-defined private gralloc usage flags. When creating a swapchain,
 the platform asks the driver to translate the requested format and image usage
 flags into gralloc usage flags by calling:</p>
 
-<p>
 <pre class="devsite-click-to-copy">
 VkResult VKAPI vkGetSwapchainGrallocUsageANDROID(
     VkDevice            device,
@@ -184,7 +181,6 @@ VkResult VKAPI vkGetSwapchainGrallocUsageANDROID(
     int*                grallocUsage
 );
 </pre>
-</p>
 
 <p>The <code>format</code> and <code>imageUsage</code> parameters are taken from
 the <code>VkSwapchainCreateInfoKHR</code> structure. The driver should fill
@@ -234,7 +230,7 @@ the following data:</p>
   .sharingMode         = VkSwapChainCreateInfoWSI::sharingMode
   .queueFamilyCount    = VkSwapChainCreateInfoWSI::queueFamilyCount
   .pQueueFamilyIndices = VkSwapChainCreateInfoWSI::pQueueFamilyIndices
-</pre></p>
+</pre>
 
 <h3 id=acquire_image>Aquiring images</h3>
 <p><code>vkAcquireImageANDROID</code> acquires ownership of a swapchain image
diff --git a/en/devices/graphics/run-tests.html b/en/devices/graphics/run-tests.html
index b0d043b2..124d7eb7 100644
--- a/en/devices/graphics/run-tests.html
+++ b/en/devices/graphics/run-tests.html
@@ -65,7 +65,7 @@ application package.</p>
 
  <tr>
     <td rowspan=2 style="vertical-align:middle">GLES3 Module</td>
-    <td><code>build/modules/gles3/deqp-gles3</td>
+    <td><code>build/modules/gles3/deqp-gles3</code></td>
     <td><code>&lt;dst&gt;/deqp-gles3</code></td>
  </tr>
 
diff --git a/en/devices/input/diagnostics.html b/en/devices/input/diagnostics.html
index 92780018..160ceaed 100644
--- a/en/devices/input/diagnostics.html
+++ b/en/devices/input/diagnostics.html
@@ -300,7 +300,7 @@ have a mouse but its HID descriptor says it does.)</p>
       ButtonState: 0x00000000
       Down: false
       DownTime: 0
-</code></pre>
+</pre>
 <p>Here is a joystick.  Notice how all of the axes have been scaled to a normalized
 range.  The axis mapping can be configured using key layout files.</p>
 <pre class="devsite-click-to-copy">
@@ -344,7 +344,7 @@ Device 18: Logitech Logitech Cordless RumblePad 2
         HAT_Y: min=-1.00000, max=1.00000, flat=0.00000, fuzz=0.00000
           scale=1.00000, offset=0.00000, highScale=1.00000, highOffset=0.00000
           rawAxis=17, rawMin=-1, rawMax=1, rawFlat=0, rawFuzz=0, rawResolution=0
-</code></pre>
+</pre>
 <p>At the end of the input reader dump there is some information about global configuration
 parameters such as the mouse pointer speed.</p>
 <pre class="devsite-click-to-copy">
@@ -366,7 +366,7 @@ parameters such as the mouse pointer speed.</p>
       SwipeMaxWidthRatio: 0.2
       MovementSpeedRatio: 0.8
       ZoomSpeedRatio: 0.3
-</code></pre>
+</pre>
 <h4 id="things-to-look-for_1">Things To Look For</h4>
 <ol>
 <li>
diff --git a/en/devices/input/getevent.html b/en/devices/input/getevent.html
index 69746bcd..3223d8ef 100644
--- a/en/devices/input/getevent.html
+++ b/en/devices/input/getevent.html
@@ -93,7 +93,7 @@ adb shell su -- getevent -lp /dev/input/event1
                 ABS_MT_PRESSURE       : value 0, min 0, max 255, fuzz 0, flat 0, resolution 0
   input props:
     INPUT_PROP_DIRECT
-</code></pre>
+</pre>
 <h2 id="showing-live-events">Showing live events</h2>
 <p>The following example shows a two-finger multi-touch gesture for a
 touchscreen using the Linux multi-touch input protocol "B". The <code>-l</code>
diff --git a/en/devices/storage/config.html b/en/devices/storage/config.html
index 49c79e52..f9f31c79 100644
--- a/en/devices/storage/config.html
+++ b/en/devices/storage/config.html
@@ -69,13 +69,13 @@ Other possible flags are <code>nonremovable</code>,
 
 <h2 id=configuration_details>Configuration details</h2>
 <p>External storage interactions at and above the framework level are handled
-through <code>StorageManagerService</code>.
-Due to configuration changes in Android 6.0 (like the
+through <code>MountService</code>. Due to configuration changes in Android 6.0 (like the
 removal of the storage_list.xml resource overlay), the configuration details
-are split into two categories.
+are split into two categories.</p>
 
 <h3 id=android_5_x_and_earlier>Android 5.x and earlier</h3>
-The device-specific <code>storage_list.xml</code> configuration
+
+<p>The device-specific <code>storage_list.xml</code> configuration
 file, typically provided through a <code>frameworks/base</code> overlay, defines the
 attributes and constraints of storage devices. The <code>&lt;StorageList&gt;</code> element
 contains one or more <code>&lt;storage&gt;</code> elements, exactly one of which should be marked
diff --git a/en/devices/tech/admin/provision.html b/en/devices/tech/admin/provision.html
index e1acd3e7..47177daa 100644
--- a/en/devices/tech/admin/provision.html
+++ b/en/devices/tech/admin/provision.html
@@ -137,7 +137,7 @@ mimetype from the setup experience:</p>
       &lt;item&gt;application/com.android.managedprovisioning&lt;/item&gt;
 </pre>
 
-<h3 id=do_provision_cs>Provisioning via Cloud Services</h2>
+<h3 id=do_provision_cs>Provisioning via Cloud Services</h3>
 <p>Device owner provisioning via cloud services is another method through which
 a device can be provisioned in device owner mode during out-of-the-box setup.
 The device can collect credentials (or tokens) and use them to perform a lookup
diff --git a/en/devices/tech/admin/testing-provision.html b/en/devices/tech/admin/testing-provision.html
index a8a219d2..af303a01 100644
--- a/en/devices/tech/admin/testing-provision.html
+++ b/en/devices/tech/admin/testing-provision.html
@@ -64,8 +64,8 @@ the corresponding tag. Available branches include:</p>
 
 <table>
 <tr>
-<th>Branch Name</td>
-<th>Supported Android Platform</td>
+<th>Branch Name</th>
+<th>Supported Android Platform</th>
 </tr>
 <tr>
 <td>afw-test-harness-nougat-dev</td>
@@ -171,9 +171,9 @@ packages from the <code>AfwTestHarness/tests</code> test package directory.
 Common plans include:
 
 <ul>
-<li><code><strong>afw-userdebug-build</code></strong>. Contains all test
+<li><code><strong>afw-userdebug-build</strong></code>. Contains all test
 packages that require a userdebug build.</li>
-<li><code><strong>afw-user-build</code></strong>. Runs on a user build but
+<li><code><strong>afw-user-build</strong></code>. Runs on a user build but
 requires the test device to be set up properly, including completing the initial
 setup and enabling USB debugging.</li>
 </ul>
@@ -288,8 +288,6 @@ as:
 as: <code>screenshot-<em>random_number</em>.png</code>.
 This information is also logged in the host log.</li>
 </ul>
-</li>
-</ul>
 
 <h2 id=faq>FAQ</h2>
 <p>For help with questions not answered below, contact
@@ -309,7 +307,8 @@ with userdebug build?</strong></p>
 <p><em>Yes, but we recommend that you run this test plan on a user build.</em></p>
 
 <p><strong>Sometimes my test fails because UI loading takes too much time. How
-can I fix this?</strong></p><em>Configure the <code>timeout_size</code> setting
+can I fix this?</strong></p>
+<p><em>Configure the <code>timeout_size</code> setting
 in <code>./android-cts/repository/testcases/afw-test.props</code>. Valid
 settings are: S, M, L, XL, XXL.</em></p>
 
@@ -330,7 +329,7 @@ your_btn.text=your_customized_text
 your_btn.package=your_package
 your_btn.action=click
 </pre>
-<em><p>To define multiple widgets, separate using commas.</em></p>
+<p><em>To define multiple widgets, separate using commas.</em></p>
 
 <p><strong>The test package
 <code>com.android.afwtest.NfcProvisioning</code> (or
diff --git a/en/devices/tech/connect/emergency-affordance.html b/en/devices/tech/connect/emergency-affordance.html
index bbaccacf..eee981b7 100644
--- a/en/devices/tech/connect/emergency-affordance.html
+++ b/en/devices/tech/connect/emergency-affordance.html
@@ -217,7 +217,7 @@ connected when the lock screen is active. The emergency dialer only connects
 calls to the list of numbers provided by the Radio Interface Layer (RIL),
 through the system property 'ril.ecclist', when no SIM is installed and
 '<code>ril.ecclist&lt;<i>SimSlotNumber</i>&gt;</code>' when a SIM is inserted
-and <code><i>&lt;SimSlotNumber&gt;</code></i> is the slot ID of the default
+and <code><i>&lt;SimSlotNumber&gt;</i></code> is the slot ID of the default
 subscriber.<br> Device manufacturers using the emergency affordance feature
 must ensure that devices in India always enable 112 as an emergency number in
 the RIL.</p>
diff --git a/en/devices/tech/dalvik/dex-format.html b/en/devices/tech/dalvik/dex-format.html
index fde14a8b..38547c97 100644
--- a/en/devices/tech/dalvik/dex-format.html
+++ b/en/devices/tech/dalvik/dex-format.html
@@ -350,7 +350,7 @@ uint NO_INDEX = 0xffffffff;    // == -1 if treated as a signed int
 </pre>
 
 <h3 id="access-flags">access_flags definitions</h3>
-<h4>embedded in class_def_item, encoded_field, encoded_method, and 
+<h4>embedded in class_def_item, encoded_field, encoded_method, and
 InnerClass</h4>
 
 <p>Bitfields of these flags are used to indicate the accessibility and
@@ -1324,7 +1324,6 @@ may appear in a <code>.dex</code> file.
     <code>0</code> if <code>field_ids_size == 0</code>. The offset, if
     non-zero, should be to the start of the <code>field_ids</code>
     section.</td>
-</td>
 </tr>
 <tr>
   <td>method_ids_size</td>
@@ -2878,7 +2877,7 @@ address += (adjusted_opcode / DBG_LINE_RANGE)
 </table>
 
 <h3 id="annotation-set-item">annotation_set_item</h3>
-<h4>referenced from annotations_directory_item, field_annotations_item, 
+<h4>referenced from annotations_directory_item, field_annotations_item,
 method_annotations_item, and annotation_set_ref_item</h4>
 <h4>appears in the data section</h4>
 <h4>alignment: 4 bytes</h4>
diff --git a/en/devices/tech/debug/asan.html b/en/devices/tech/debug/asan.html
index 353aa4bd..1c12ad62 100644
--- a/en/devices/tech/debug/asan.html
+++ b/en/devices/tech/debug/asan.html
@@ -74,7 +74,7 @@ output and to <code>logcat</code> and then crashes the process.</p>
 <p>Due to the way ASan works, a library built with ASan cannot be used by an
 executable that's built without ASan.</p>
 
-<p class="note">Note</strong>: In runtime situations where an ASan library is
+<p class="note"><strong>Note</strong>: In runtime situations where an ASan library is
 loaded into an incorrect process, you will see unresolved symbol messages
 starting with <code>_asan</code> or <code>_sanitizer</code>.</p>
 
@@ -155,7 +155,7 @@ the availability of symbolized libraries on the host.</p>
 
 <p>AddressSanitizer cannot see into Java code, but it can detect bugs in the JNI
 libraries. For that, you'll need to build the executable with ASan, which in
-this case is <code>/system/bin/app_process(<em>32|64</code></em>). This will
+this case is <code>/system/bin/app_process(<em>32|64</em>)</code>. This will
 enable ASan in all apps on the device at the same time, which is a
 bit stressful, but nothing that a 2GB RAM device cannot handle.</p>
 
diff --git a/en/devices/tech/debug/native-crash.html b/en/devices/tech/debug/native-crash.html
index c1658cc5..00f72cd0 100644
--- a/en/devices/tech/debug/native-crash.html
+++ b/en/devices/tech/debug/native-crash.html
@@ -46,7 +46,7 @@ using one of the Android-specific fatal logging types), but they all involve
 calling <code>abort</code>. A call to <code>abort</code> basically signals the
 calling thread with SIGABRT, so a frame showing "abort" in <code>libc.so</code>
 plus SIGABRT are the things to look for in the <code>debuggerd</code> output to
-recognize this case.
+recognize this case.</p>
 
 <p>
 As mentioned above, there may be an explicit "abort message" line. But you
@@ -83,7 +83,7 @@ backtrace:
 More recent versions call <code><a
 href="http://man7.org/linux/man-pages/man2/tgkill.2.html">tgkill(2)</a></code>
 directly from <code>abort</code>, so there are fewer stack frames for you to
-skip over before you get to the interesting frames:
+skip over before you get to the interesting frames:</p>
 
 <pre class="devsite-click-to-copy">
 pid: 25301, tid: 25301, name: crasher  >>> crasher <<<
@@ -155,6 +155,7 @@ href="http://man7.org/linux/man-pages/man3/fopen.3.html">fopen(3)</a></code> or
 <code><a
 href="http://man7.org/linux/man-pages/man3/opendir.3.html">opendir(3)</a></code>
 call actually succeeded first.
+</p>
 
 <p>
 Here's an example of <code>readdir</code>:
@@ -192,7 +193,7 @@ offset <code>sizeof(int) + sizeof(size_t) + sizeof(dirent*)</code> into
 <code>struct DIR</code>, which on a 32-bit device is 4 + 4 + 4 = 12 = 0xc, so
 you found the bug: <code>readdir</code> was passed a null pointer by the caller.
 At this point you can paste the stack into the stack tool to find out
-<em>where</em> in logcat this happened.
+<em>where</em> in logcat this happened.</p>
 
 <pre class="prettyprint">
   struct DIR {
@@ -396,7 +397,7 @@ ip 00000006 sp ff96ad18 lr f700ced5 pc f700dc98 cpsr 400b0010
 
 <p>The register dump shows the content of the CPU registers at the time the
 signal was received. (This section varies wildly between ABIs.) How useful
-these are will depend on the exact crash.<p>
+these are will depend on the exact crash.</p>
 
 <pre class="devsite-click-to-copy">
 backtrace:
@@ -464,7 +465,7 @@ that can be recognized by looking at the maps include:</p>
 will show the BuildId (if present) in Android M and later, so you can see
 exactly which version of your code crashed. (Platform binaries include a
 BuildId by default since Android M. NDK r12 and later automatically pass
-<code>-Wl,--build-id</code> to the linker too.)<p>
+<code>-Wl,--build-id</code> to the linker too.)</p>
 
 <pre class="devsite-click-to-copy">
 ab163000-ab163fff r--      3000      1000  /system/xbin/crasher
diff --git a/en/devices/tech/display/hdr.html b/en/devices/tech/display/hdr.html
index f85ff1da..53e4ae8f 100644
--- a/en/devices/tech/display/hdr.html
+++ b/en/devices/tech/display/hdr.html
@@ -167,9 +167,9 @@ array if HDR is not supported by the display.</li>
 
 <h3 id="decoder">Decoder</h3>
 
-<p>Applications shall use the existing 
+<p>Applications shall use the existing
 <a href="https://developer.android.com/reference/android/media/MediaCodecInfo.CodecCapabilities.html#profileLevels">
-<code>CodecCapabilities.profileLevels</code></a> API to verify support for the 
+<code>CodecCapabilities.profileLevels</code></a> API to verify support for the
 new HDR capable profiles:</p>
 
 <h4>Dolby-Vision</h4>
@@ -385,10 +385,12 @@ that matches the display's color volume.</li>
 <li>Determine the color, mastering, and potential dynamic metadata for the
 blended scene.</li>
 <li>Convert the resulting blended scene to the derived color
-space/volume.</ol></li>
+space/volume.</li>
+</ol>
+</li>
 <li>If displaying directly to the display, convert the resulting blended
 scene to the required display signals to produce that scene.
-</ol></li>
+</li>
 </ol>
 
 <h4>Display discovery</h4>
@@ -407,16 +409,19 @@ its HDR capability through HDMI EDID as defined in
 <a href="https://standards.cta.tech/kwspub/published_docs/CTA-861.3-Preview.pdf">
 CTA-861.3</a>
 section 4.2.</li>
-<li>The following EOTF mapping shall be used:<ul>
+<li>The following EOTF mapping shall be used:
+<ul>
 <li>ET_0 Traditional gamma - SDR Luminance Range: not mapped to any HDR
 type</li>
 <li>ET_1 Traditional gamma - HDR Luminance Range: not mapped to any HDR
 type</li>
-<li>ET_2 SMPTE ST 2084 - mapped to HDR type HDR10</ul></li>
+<li>ET_2 SMPTE ST 2084 - mapped to HDR type HDR10</li>
+</ul>
+</li>
 <li>The signaling of Dolby Vision or HLG support over HDMI is done as defined
 by their relevant bodies.</li>
 <li>Note that the HWC2 API uses float desired luminance values, so the 8-bit
-EDID values must be translated in a suitable fashion.</ul></li>
+EDID values must be translated in a suitable fashion.</li>
 </ul>
 
 <h3 id="decoders">Decoders</h3>
diff --git a/en/devices/tech/ota/sign_builds.html b/en/devices/tech/ota/sign_builds.html
index fbc0d718..06106755 100644
--- a/en/devices/tech/ota/sign_builds.html
+++ b/en/devices/tech/ota/sign_builds.html
@@ -33,9 +33,9 @@ holds true both for updating user apps by overwriting the .apk, and for
 overriding a system app with a newer version installed under
 <code>/data</code>.</li>
 <li>If two or more applications want to share a user ID (so they can share
-data, etc.), they must be signed with the same key.</ul></li>
+data, etc.), they must be signed with the same key.</li></ul>
 <li>OTA update packages must be signed with one of the keys expected by the
-system or the installation process will reject them.</ul></li>
+system or the installation process will reject them.</li>
 </ol>
 
 <h2 id="release-keys">Release keys</h2>
diff --git a/en/devices/tech/test_infra/tradefed/full_example.html b/en/devices/tech/test_infra/tradefed/full_example.html
index f2bbb704..32b6b28f 100644
--- a/en/devices/tech/test_infra/tradefed/full_example.html
+++ b/en/devices/tech/test_infra/tradefed/full_example.html
@@ -151,7 +151,7 @@ example/helloworld: Runs the hello world test
 tf&gt; run example/helloworld
 05-12 13:21:21 I/TestInvocation: Starting invocation for target stub on build 0 on device 004ad9880810a548
 Hello, TF World!
-</code></pre>
+</pre>
 
 <h2 id="deviceinteract">Interacting with a device (D, R)</h2>
 <p>So far, our HelloWorldTest isn't doing anything interesting. Tradefed's
@@ -294,7 +294,7 @@ Hello, TF World! I have device 004ad9880810a548
 05-16 21:07:07 I/XmlResultReporter: Saved device_logcat log to /tmp/0/inv_2991649128735283633/device_logcat_6999997036887173857.txt
 05-16 21:07:07 I/XmlResultReporter: Saved host_log log to /tmp/0/inv_2991649128735283633/host_log_6307746032218561704.txt
 05-16 21:07:07 I/XmlResultReporter: XML test result file generated at /tmp/0/inv_2991649128735283633/test_result_536358148261684076.xml. Total tests 1, Failed 1, Error 0
-</code></pre>
+</pre>
 
 <p>Notice the log message stating that an XML file has been generated; the
 generated file should look like this:</p>
@@ -365,7 +365,7 @@ full class name of <code>FileLogger</code>:</p>
     &lt;result_reporter class="com.android.tradefed.result.XmlResultReporter" /&gt;
     &lt;logger class="com.android.tradefed.log.FileLogger" /&gt;
 &lt;/configuration&gt;
-</code></pre>
+</pre>
 
 <p>Now, rebuild and run the helloworld example again:</p>
 <pre class="devsite-click-to-copy">
@@ -374,7 +374,7 @@ tf &gt;run example/helloworld
 05-16 21:38:21 I/XmlResultReporter: Saved device_logcat log to /tmp/0/inv_6390011618174565918/device_logcat_1302097394309452308.txt
 05-16 21:38:21 I/XmlResultReporter: Saved host_log log to /tmp/0/inv_6390011618174565918/host_log_4255420317120216614.txt
 …
-</code></pre>
+</pre>
 <p>The log message indicates the path of the host log, which, when viewed,
 should contain your HelloWorldTest log message:</p>
 <pre class="devsite-terminal devsite-click-to-copy">
@@ -453,7 +453,7 @@ Printing help for only the important options. To see help for all options, use t
 
   'file' logger options:
     --log-level-display  the minimum log level to display on stdout. Must be one of verbose, debug, info, warn, error, assert. Default: error.
-</code></pre>
+</pre>
 
 <p>Note the message about "printing only the important options." To reduce
 option help clutter, TF uses the <code>Option#importance</code> attribute to
@@ -500,7 +500,7 @@ stdout, in addition to being logged to a file:</p>
 tf&gt; run example/helloworld --log-level-display info
 …
 05-24 18:53:50 I/HelloWorldTest: Hello, TF World! I have device 004ad9880810a548
-</code></pre>
+</pre>
 
 <h2 id="conclusion">That's all, folks!</h2>
 <p>As a reminder, if you're stuck on something, the
diff --git a/en/devices/tv/hdmi-cec.html b/en/devices/tv/hdmi-cec.html
index 6510901d..6532bf76 100644
--- a/en/devices/tv/hdmi-cec.html
+++ b/en/devices/tv/hdmi-cec.html
@@ -115,7 +115,6 @@ PRODUCT_PROPERTY_OVERRIDES += ro.hdmi.device_type=<strong>4</strong>
 
 <pre class="devsite-click-to-copy">
 PRODUCT_PROPERTY_OVERRIDES += ro.hdmi.device_type=<strong>0</strong></pre>
-</p>
 
 
 <ul>
diff --git a/en/devices/tv/reference-tv-app.html b/en/devices/tv/reference-tv-app.html
index db4b1763..7a35de56 100644
--- a/en/devices/tv/reference-tv-app.html
+++ b/en/devices/tv/reference-tv-app.html
@@ -98,7 +98,7 @@ different one listed in the table above.</p>
 
 <pre class="devsite-click-to-copy">
 <code class="devsite-terminal">. build/envsetup.sh</code>
-<code class="devsite-terminal">apas LiveTv x86</code>
+<code class="devsite-terminal">tapas LiveTv x86</code>
 <code class="devsite-terminal">make LiveTv</code>
 </pre>
 
@@ -151,7 +151,7 @@ adb shell am instrument \
 <h3 id=functional_tests>Functional Tests</h3>
 
 <pre class="devsite-terminal devsite-click-to-copy">
-$ adb shell logcat -c
+adb shell logcat -c
 m LiveTv TVTestInput TVFuncTests -j20 &&\
 adb install -r -d $OUT/system/priv-app/LiveTv/LiveTv.apk &&\
 adb install -r -d $OUT/system/app/TVTestInput/TVTestInput.apk && \
@@ -173,7 +173,7 @@ adb shell am instrument \
 <p>The Jank tests look for dropped frames and delays in rendering.</p>
 
 <pre class="devsite-terminal devsite-click-to-copy">
-$ adb shell logcat -c
+adb shell logcat -c
 m LiveTv TVTestInput TVJankTests -j20 &&\
 adb install -r -d $OUT/system/priv-app/LiveTv/LiveTv.apk &&\
 adb install -r -d $OUT/system/app/TVTestInput/TVTestInput.apk &&\
diff --git a/en/security/bulletin/2017-06-01.html b/en/security/bulletin/2017-06-01.html
index 02a2578a..27b60035 100644
--- a/en/security/bulletin/2017-06-01.html
+++ b/en/security/bulletin/2017-06-01.html
@@ -645,7 +645,7 @@ href="https://source.codeaurora.org/quic/la/kernel/msm-3.18/commit/?id=7c4d5736d
    <a href="https://source.codeaurora.org/quic/la/kernel/msm-3.18/commit/?id=6a3b8afdf97e77c0b64005b23fa6d32025d922e5">QC-CR#2009231</a></td>
    <td>EoP</td>
    <td>Moderate</td>
-   <td>Secure execution environment communication driver</td>
+   <td>Secure Execution Environment Communicator driver</td>
   </tr>
   <tr>
    <td>CVE-2017-8239</td>
diff --git a/en/source/initializing.html b/en/source/initializing.html
index 7e87f5e1..e2236185 100644
--- a/en/source/initializing.html
+++ b/en/source/initializing.html
@@ -21,13 +21,16 @@
       limitations under the License.
   -->
 
-
-
 <p>This section describes how to set up your local work environment to build
 the Android source files. You will need to use Linux or Mac OS. Building under
 Windows is not currently supported.</p>
 <p>For an overview of the entire code-review and code-update process, see <a
 href="life-of-a-patch.html">Life of a Patch</a>.</p>
+<p class="note"><strong>Note:</strong> All commands in this site are preceded
+by a dollar sign ($) to differentiate them from output or entries within files.
+You may use the <em>Click to copy</em> feature at the top right of each command
+box to copy all lines without the dollar signs or triple-click each line to
+copy it individually without the dollar sign.</p>
 <h2 id="choosing-a-branch">Choosing a Branch</h2>
 <p>Some of the requirements for your build environment are determined by which
 version of the source code you plan to compile. See
diff --git a/en/source/known-issues.html b/en/source/known-issues.html
index 90c95f8d..e72de555 100644
--- a/en/source/known-issues.html
+++ b/en/source/known-issues.html
@@ -1,6 +1,6 @@
 <html devsite>
   <head>
-    <title>Known Issues</title>
+    <title>Source Sync Issues</title>
     <meta name="project_path" value="/_project.yaml" />
     <meta name="book_path" value="/_book.yaml" />
   </head>
@@ -21,132 +21,11 @@
       limitations under the License.
   -->
 
+  <p>Even with our best care, small problems sometimes slip in. This page details
+   some known issues you may encounter while trying to sync the Android source code.
 
-
-<p>Even with our best care, small problems sometimes slip in. This page keeps
-track of the known issues around using the Android source code.</p>
-
-<h2 id="build-issues">Build issues</h2>
-
-<h3 id="missing-cellbroadcastreceiver">Missing CellBroadcastReceiver in toro builds</h3>
-<p><strong>Symptom</strong></p>On AOSP builds for toro (up to Jelly Bean 4.2.1),
-CellBroadcastReceiver doesn't get included in the system.</p>
-
-<p><strong>Cause:</strong></p> There's a typo in <code>vendor/samsung/toro/device-partial.mk</code>,
-where <code>PRODUCT_PACKAGES</code> has the K replaced by an H.
-<p><strong>Fix</strong>: Use the latest packages for 4.2.2, or manually fix the typo.</p>
-
-<h3 id="missing-cts-native-xml-generator">Missing CTS Native XML Generator</h3>
-<p><strong>Symptom</strong>: On some builds of IceCreamSandwich and later, the following
-warning is printed early during the build:
-<code>/bin/bash: line 0: cd: cts/tools/cts-native-xml-generator/src/res: No
-such file or directory</code></p>
-<p><strong>Cause</strong>: Some makefile references that path, which doesn't exist.</p>
-<p><strong>Fix</strong>: None. This is a harmless warning.</p>
-
-<h3 id="black-gingerbread-emulator">Black Gingerbread Emulator</h3>
-<p><strong>Symptom</strong>: The emulator built directly from the gingerbread branch
-doesn't start and stays stuck on a black screen.</p>
-<p><strong>Cause</strong>: The gingerbread branch uses version R7 of the emulator,
-which doesn't have all the features necessary to run recent versions
-of gingerbread.</p>
-<p><strong>Fix</strong>: Use version R12 of the emulator, and a newer kernel that matches
-those tools. No need to do a clean build.</p>
-<pre class="devsite-click-to-copy">
-<code class="devsite-terminal">repo forall platform/external/qemu -c git checkout aosp/tools_r12</code>
-<code class="devsite-terminal">make</code>
-<code class="devsite-terminal">emulator -kernel prebuilt/android-arm/kernel/kernel-qemu-armv7</code>
-</pre>
-
-<h3 id="emulator-built-on-macos-107-lion-doesnt-work">Emulator built on MacOS 10.7 Lion doesn't work.</h3>
-<p><strong>Symptom</strong>: The emulator (any version) built on MacOS 10.7 Lion
-and/or on XCode 4.x doesn't start.</p>
-<p><strong>Cause</strong>: Some change in the development environment causes
-the emulator to be compiled in a way that prevents it from working.</p>
-<p><strong>Fix</strong>: Use an emulator binary from the SDK, which is built on
-MacOS 10.6 with XCode 3 and works on MacOS 10.7.</p>
-
-<h3 id="partial-and-emulator-builds"><code>WITH_DEXPREOPT=true</code> and emulator builds.</h3>
-<p><strong>Symptom</strong>: When conducting partial builds or syncs (make system no dependencies)
-on emulator builds, the resulting build doesn't work.</p>
-<p><strong>Cause</strong>: All emulator builds now run Dex optimization at build
-time by default, which requires to follow all dependencies to
-re-optimize the applications each time the framework changes.</p>
-<p><strong>Fix</strong>: Locally disable Dex optimizations by entering the following command:</p>
-<pre class="devsite-terminal devsite-click-to-copy">export WITH_DEXPREOPT=false</pre>
-<p>Delete the existing optimized version by entering the following command:</p>
-<pre class="devsite-terminal devsite-click-to-copy">make installclean</pre>
-<p>Run a full build to re-generate non-optimized versions. After that, partial builds will work.</p>
-
-<h3 id="permission-denied-during-builds">"Permission Denied" during builds.</h3>
-<p><strong>Symptom</strong>: All builds fail with "Permission Denied", possibly
-along with anti-virus warnings.</p>
-<p><strong>Cause</strong>: Some anti-virus programs mistakenly recognize some
-source files in the Android source tree as if they contained
-viruses.</p>
-<p><strong>Fix</strong>: After verifying that there are no actual viruses
-involved, disable anti-virus on the Android tree. This has
-the added benefit of reducing build times.</p>
-
-<h3 id="build-errors-related-to-using-the-wrong-compiler">Build errors related to using the wrong compiler.</h3>
-<p><strong>Symptom</strong>: The build fails with various symptoms. One
-such symptom is <code>cc1: error: unrecognized command line option "-m32"</code></p>
-<p><strong>Cause</strong>: The Android build system uses the default compiler
-in the PATH, assuming it's a suitable compiler to generate
-binaries that run on the host. Other situations (e.g. using
-the Android NDK or building the kernel) cause the default
-compiler to not be a host compiler.</p>
-<p><strong>Fix</strong>: Use a "clean" shell, in which no previous
-actions could have swapped the default compiler.</p>
-
-<h3 id="build-errors-caused-by-non-default-tool-settings">Build errors caused by non-default tool settings.</h3>
-<p><strong>Symptom</strong>: The build fails with various symptoms, possibly
-complaining about missing files or files that have the
-wrong format. One such symptom is <code>member [...] in archive is not an object</code>.</p>
-<p><strong>Cause</strong>: The Android build system tends to use many host tools
-and to rely on their default behaviors. Some settings change
-those tools' behaviors and make them behave in ways that
-confuse the build system. Variables known to cause such
-issues are <code>CDPATH</code> and <code>GREP_OPTIONS</code>.</p>
-<p><strong>Fix</strong>: Build Android in an environment that has as few
-customizations as possible.</p>
-
-<h3 id="build-error-with-40x-and-earlier-on-macos-107">Build error with 4.0.x and earlier on MacOS 10.7.</h3>
-<p><strong>Symptom</strong>: Building IceCreamSandwich 4.0.x (and older
-versions) fails on MacOS 10.7 with errors similar to this:
-<code>Undefined symbols for architecture i386: "_SDL_Init"</code></p>
-<p><strong>Cause</strong>: 4.0.x is not compatible with MacOS 10.7.</p>
-<p><strong>Fix</strong>: Either downgrade to MacOS 10.6, or use the master
-branch, which can be built on MacOS 10.7.</p>
-<pre class="devsite-click-to-copy">
-<code class="devsite-terminal">repo init -b master</code>
-<code class="devsite-terminal">repo sync</code>
-</pre>
-
-<h3 id="build-error-on-macos-with-xcode-43">Build error on MacOS with XCode 4.3.</h3>
-<p><strong>Symptom</strong>: All builds fail when using XCode 4.3.</p>
-<p><strong>Cause</strong>: XCode 4.3 switched the default compiler from
-gcc to llvm, and llvm rejects code that used to be
-accepted by gcc.</p>
-<p><strong>Fix</strong>: Use XCode 4.2.</p>
-
-<h3 id="build-error-with-40x-and-earlier-on-ubuntu-1110">Build error with 4.0.x and earlier on Ubuntu 11.10.</h3>
-<p><strong>Symptom</strong>: Building IceCreamSandwich 4.0.x (and older
-versions) on Ubuntu 11.10 and newer fails with errors similar to this:
-<code>&lt;command-line&gt;:0:0: warning: "_FORTIFY_SOURCE" redefined [enabled by default]</code></p>
-<p><strong>Cause</strong>: Ubuntu 11.10 uses a version of gcc where that symbol
-is defined by default, and Android also defines that symbol,
-which causes a conflict.</p>
-<p><strong>Fix</strong>: Either downgrade to Ubuntu 10.04, or use the master
-branch, which can be compiled on Ubuntu 11.10 and newer.</p>
-<pre class="devsite-click-to-copy">
-<code class="devsite-terminal">repo init -b master</code>
-<code class="devsite-terminal">repo sync</code>
-</code></pre>
-
-<h2 id="source-sync">Source sync issues</h2>
-
-<h3 id="difficulties-syncing-the-source-code-proxy-issues">Difficulties syncing the source code (proxy issues).</h3>
+<h2 id="difficulties-syncing-the-source-code-proxy-issues">
+Difficulties syncing the source code (proxy issues)</h2>
 <p><strong>Symptom</strong>: <code>repo init</code> or <code>repo sync</code> fail with http errors,
 typically 403 or 500.</p>
 <p><strong>Cause</strong>: There are quite a few possible causes, most often
@@ -156,18 +35,8 @@ large amounts of data getting transferred.</p>
 and explicitly using <code>repo sync -j1</code> have been reported to
 improve the situation for some users.</p>
 
-<h3 id="difficulties-syncing-the-source-tree-virtualbox-ethernet-issues">Difficulties syncing the source tree (VirtualBox Ethernet issues).</h3>
-<p><strong>Symptom</strong>: When running <code>repo sync</code> in some VirtualBox installations,
-the process hangs or fails with a variety of possible symptoms.
-One such symptom is
-<code>DownloadError: HTTP 500 (Internal Server Error: Server got itself in trouble)</code>.</p>
-<p><strong>Cause</strong>: The default network behavior of VirtualBox is to use
-NAT (Network Address Translation) to connect the guest system to
-the network. The heavy network activity of repo sync triggers some
-corner cases in the NAT code.</p>
-<p><strong>Fix</strong>: Configure VirtualBox to use bridged network instead of NAT.</p>
-
-<h3 id="difficulties-syncing-the-source-tree-dns-issues">Difficulties syncing the source tree (DNS issues).</h3>
+<h2 id="difficulties-syncing-the-source-tree-dns-issues">
+Difficulties syncing the source tree (DNS issues)</h2>
 <p><strong>Symptom</strong>: When running <code>repo sync</code>, the process fails with
 various errors related to not recognizing the hostname. One such
 error is <code>&lt;urlopen error [Errno -2] Name or service not known&gt;</code>.</p>
@@ -193,7 +62,8 @@ eee.fff.ggg.hhh android.googlesource.com
 don't change, and if they do and you can't connect you'll have
 to resolve those hostnames again and edit <code>etc/hosts</code> accordingly.</p>
 
-<h3 id="difficulties-syncing-the-source-tree-tcp-issues">Difficulties syncing the source tree (TCP issues).</h3>
+<h2 id="difficulties-syncing-the-source-tree-tcp-issues">
+Difficulties syncing the source tree (TCP issues)</h2>
 <p><strong>Symptom</strong>: <code>repo sync</code> hangs while syncing, often when it's
 completed 99% of the sync.</p>
 <p><strong>Cause</strong>: Some settings in the TCP/IP stack cause difficulties
@@ -204,15 +74,5 @@ nor fails.</p>
 <p>On MacOS, disable the rfc1323 extension in the network settings.</p>
 
 
-<h2 id="runtime-issues">Runtime issues</h2>
-<h3 id="camera-and-gps-dont-work-on-galaxy-nexus">Camera and GPS don't work on Galaxy Nexus.</h3>
-<p><strong>Symptom</strong>: Camera and GPS don't work on Galaxy Nexus.
-As an example, the Camera application crashes as soon as it's
-launched.</p>
-<p><strong>Cause</strong>: Those hardware peripherals require proprietary
-libraries that aren't available in the Android Open Source
-Project.</p>
-<p><strong>Fix</strong>: None.</p>
-
   </body>
 </html>