Merge change 23515 into eclair

* changes:
  Update apkbuilder to support new property names