Merge "change location of apns-conf.xml and vold.conf" into jb-dev