Merge "Cut the dependency to framework from droiddoc modules"