Doc update: manual merge of changes from jb-mr1.1
Doc update: manual merge of changes from jb-mr1.1

Change-Id: I9f738f62c5e147c4bacacd674ed15a18b089f860

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base