am eb6403e9: resolved conflicts for merge of bfdd2566 to jb-mr2-dev-plus-aosp

* commit 'eb6403e95d601b62be7b4610599e72fd329f2666':
  Generate SDK docs for v7 support library packages.