Merge change 4689 into donut

* changes:
  Update the API of ApkBuilder to make it clearer what is stable and what isn't.