am 53ba6b22: am 15d15136: Merge "change location of apns-conf.xml and vold.conf" into jb-dev

* commit '53ba6b22f94c1192541b11ada001b68823b97efa':
  change location of apns-conf.xml and vold.conf