Merge changes from topic "drop_circular_dep" into stage-aosp-master

* changes:
  Cut the dependency to framework from droiddoc modules
  Remove -without-aidls filegroups for the media apex.