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