Docs: Adding new diagram images
      Adding new images for TV and HAL components. Minor edits to adjust image float/flow.
      Adding new images for DRM. Minor edits to correct orphans.
      Adding changes to audio diagram

Bug: 18947698

Change-Id: I7bf808fc0bbd99a8fa77f333f933a88a4942bf80
diff --git a/src/devices/camera/index.jd b/src/devices/camera/index.jd
index 012f989..419242a 100644
--- a/src/devices/camera/index.jd
+++ b/src/devices/camera/index.jd
@@ -2,7 +2,7 @@
 @jd:body
 
 <!--
-    Copyright 2014 The Android Open Source Project
+    Copyright 2015 The Android Open Source Project
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -24,12 +24,16 @@
   </div>
 </div>
 
+<img style="float: right; margin: 0px 15px 15px 0px;" src="images/ape_fwk_hal_camera.png" alt="Android Camera HAL icon" width="175" />
+
 <p>Android's camera HAL connects the higher level
-camera framework APIs in <a href="http://developer.android.com/reference/android/hardware/package-summary.html">android.hardware</a> to your underlying camera driver and hardware.
-The following figure and list describe the components involved and where to find the source for each:
+camera framework APIs in <a href="http://developer.android.com/reference/android/hardware/package-summary.html">android.hardware</a> to your underlying camera driver and hardware.</p>
+
+<h2 id="architecture">Architecture</h2>
+<p>The following figure and list describe the components involved and where to find the source for each:
 </p>
 
-<img src="images/camera_hal.png" alt="Android camera architecture" id="figure1" />
+<img src="images/ape_fwk_camera.png" alt="Android camera architecture" id="figure1" />
 <p class="img-caption">
   <strong>Figure 1.</strong> Camera architecture
 </p>