Merge "Default droiddoc to disting the api txt if there is one" into rvc-dev am: b4cf9df6 am: 442488e2 Change-Id: Ic71a1d6d2b68414e88b1bd59fea8bd310d92ea28