[automerger skipped] Merge "Cut the dependency to framework from droiddoc modules"
am: a067de365a -s ours
am skip reason: change_id I09ad88da47540d31ad089aad5e1151a4b6877ec2 with SHA1 5366ea2089 is in history

Change-Id: Id5d789ac77735257c7258b90a86ed30c1a573566