Merge "Add dist-for-goals for droiddoc docs.zip"