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