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

Merge commit 'ca88861ba6ede0e577d92c1ed103fd4acd3fc0ba' into gingerbread-plus-aosp

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