[automerger skipped] Merge "Convert disting of api txt from mk to bp" am: 019256c4a6 am: 0aa113c0c4 -s ours

am skip reason: Change-Id I96052b427dc01a6d24b040ad0006129d4d1e48fb with SHA-1 d9a3fee23d is in history

Change-Id: I7df37cd363d7f7a653c22a5fc6e255fbb6c6970f