am 7a4e83b2: am 85e86626: Merge "include recovery-resource.dat in /system/etc" into jb-mr1-dev

* commit '7a4e83b235aeec6036440cb3b86311418f2e8c25':
  include recovery-resource.dat in /system/etc