Improved architecture diagram from O'Reilly

Change-Id: Ie0d313c19f1b9c925db57e89d04dc2e307f16fff
Closes-Bug: 1292867
Merge "Improved architecture diagram from O'Reilly"