Merge "Cherry-pick from master: AAPT2: Fix JavaDoc first sentence extraction." into oc-mr1-dev
am: aa6f03639a

Change-Id: Iaa4705ad89b995eac11e8f07b7be86eb2483a205