Merge "Adjust for changes to libcore/Docs.mk" am: f5e3398596 am: c08debc23a
am: 144af426cd

* commit '144af426cde3ce336ed9f670ae596807a14ab809':
  Adjust for changes to libcore/Docs.mk