am 9fd6b635: am ca88861b: am 783f449b: Don\'t copy apns-conf.xml for apps-only build

Merge commit '9fd6b635d4f631968ed7a39394918ea3cd87f459'

* commit '9fd6b635d4f631968ed7a39394918ea3cd87f459':
  Don't copy apns-conf.xml for apps-only build