release-request-e32f3567-b299-4433-aaca-18a62b3f00c0-for-git_oc-dr1-release-3964195 snap-temp-L52500000059616409

Change-Id: If010398557c3a502b72e0c135d3d03075fecda31

2 files changed, 18 insertions, 15 deletions

diff --git a/en/security/overview/implement.html b/en/security/overview/implement.html
index bbe1967c..7233a34d 100644
--- a/en/security/overview/implement.html
+++ b/en/security/overview/implement.html
@@ -56,6 +56,9 @@ automated source code review. Best practices:</p>
 application code using the Android SDK and correct any identified issues.</li>
 <li>Native code should be analyzed using an automated tool that can detect
 memory management issues such as buffer overflows and off-by-one errors.</li>
+<li>The Android build system has support for many of the LLVM sanitizers,
+such as AddressSanitizer and UndefinedBehaviorSanitizer which can be used
+for this purpose.</li>
 </ul>
 
 <h3 id="auto-test">Using automated testing</h3>
diff --git a/en/security/overview/updates-resources.html b/en/security/overview/updates-resources.html
index c524b5ff..fcf199f5 100644
--- a/en/security/overview/updates-resources.html
+++ b/en/security/overview/updates-resources.html
@@ -275,40 +275,40 @@ href="https://developer.android.com">https://developer.android.com</a></p>
 
 <p>Security information exists throughout the Android Open Source and Developer
 sites. Good places to start:<br>
-<a href="https://source.android.com/security/index.html">https://source.android.com/security/index.html</a><br>
+<a href="/security/index.html">https://source.android.com/security/index.html</a><br>
 <a href="https://developer.android.com/training/articles/security-tips.html">https://developer.android.com/training/articles/security-tips.html</a></p>
 
 <h3 id=reports>Reports</h3>
 <p>Sometimes the Android Security team publishes reports or whitepapers. Here are some of the most recent.</p>
 <ul>
-  <li><a href="http://static.googleusercontent.com/media/source.android.com/en//security/reports/Google_Android_Security_2016_Report_Final.pdf">
+  <li><a href="/security/reports/Google_Android_Security_2016_Report_Final.pdf">
       Android Security 2016 Year In Review</a></li>
-  <li><a href="http://static.googleusercontent.com/media/source.android.com/en//security/reports/Google_Android_Security_2015_Report_Final.pdf">
+  <li><a href="/security/reports/Google_Android_Security_2015_Report_Final.pdf">
       Android Security 2015 Year In Review</a></li>
-  <li><a href="http://static.googleusercontent.com/media/source.android.com/en//security/reports/Google_Android_Security_2014_Report_Final.pdf">
+  <li><a href="/security/reports/Google_Android_Security_2014_Report_Final.pdf">
       Android Security 2014 Year In Review</a></li>
-  <li><a href="http://static.googleusercontent.com/media/source.android.com/en//security/reports/Android_WhitePaper_Final_02092016.pdf">
+  <li><a href="/security/reports/Android_WhitePaper_Final_02092016.pdf">
       Android Security white paper</a></li>
-  <li><a href="http://static.googleusercontent.com/media/source.android.com/en//security/reports/Google_Android_Security_PHA_classifications.pdf">
+  <li><a href="/security/reports/Google_Android_Security_PHA_classifications.pdf">
       Classifications for Potentially Harmful Applications</a></li>
 </ul>
 
-<h3 id=slides>Android Bootcamp 2016 slides</h3>
-<p>The Android Security team has published their Android Bootcamp 2016 slides that cover new security features.</p>
+<h3 id=slides>Presentations</h3>
+<p>The Android Security team presents at various conferences and talks. Here are some of their slides:</p>
 <ul>
-  <li><a href="http://static.googleusercontent.com/media/source.android.com/en//security/reports/Android-Bootcamp-2016-Verified-Boot-and-Encryption.pdf">
+  <li><a href="/security/reports/Android-Bootcamp-2016-Verified-Boot-and-Encryption.pdf">
       Verified boot and encryption</a></li>
-  <li><a href="http://static.googleusercontent.com/media/source.android.com/en//security/reports/Android-Bootcamp-2016-SafetyNet.pdf">
+  <li><a href="/security/reports/Android-Bootcamp-2016-SafetyNet.pdf">
       SafetyNet</a></li>
-  <li><a href="http://static.googleusercontent.com/media/source.android.com/en//security/reports/Android-Bootcamp-2016-New-App-Lifecycle-for-Encryption.pdf">
+  <li><a href="/security/reports/Android-Bootcamp-2016-New-App-Lifecycle-for-Encryption.pdf">
       New app life cycle for encryption</a></li>
-  <li><a href="http://static.googleusercontent.com/media/source.android.com/en//security/reports/Android-Bootcamp-2016-Keeping-Google-Play-safe.pdf">
+  <li><a href="/security/reports/Android-Bootcamp-2016-Keeping-Google-Play-safe.pdf">
       Keeping Google Play safe</a></li>
-  <li><a href="http://static.googleusercontent.com/media/source.android.com/en//security/reports/Android-Bootcamp-2016-Defense-in-depth-efforts.pdf">
+  <li><a href="/security/reports/Android-Bootcamp-2016-Defense-in-depth-efforts.pdf">
       Defense in depth efforts</a></li>
-  <li><a href="http://static.googleusercontent.com/media/source.android.com/en//security/reports/Android-Bootcamp-2016-Android-Keystore-Attestation.pdf">
+  <li><a href="/security/reports/Android-Bootcamp-2016-Android-Keystore-Attestation.pdf">
       Keystore attestation</a></li>
-  <li><a href="http://static.googleusercontent.com/media/source.android.com/en//security/reports/Android-Bootcamp-2016-Android-Attack-Team.pdf">
+  <li><a href="/security/reports/Android-Bootcamp-2016-Android-Attack-Team.pdf">
       Android attack team</a></li>
 </ul>