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

* commit '15d151367482b6ed47cecf1a578b365b7c6ccab3':
  change location of apns-conf.xml and vold.conf