Dist the merged api txts for normal builds too

Makes the merged txts available on the build server for most
continuous builds.

Bug: 169034951
Bug: 170802619
Test: m dist && diff frameworks/base/api and out/dist/api
Change-Id: I57daa8e42c3931070f19cde9a74d2b11d03d2d6d