Merge "include recovery-resource.dat in /system/etc" into jb-mr1-dev