[automerger skipped] Merge "Default droiddoc to disting the api txt if there...
[automerger skipped] Merge "Default droiddoc to disting the api txt if there is one" am: 282dc32f am: 03668529 -s ours
am skip reason: Change-Id Ia168d3e5d18dc4f0ed5ca9d69720db57c2b91f80 with SHA-1 37a1e4c1 is in history
Change-Id: Ic386350643c668fdad0fb674b00848f1e9a378af