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

* commit '85e86626e952bca488b2bacc57743e59132794bc':
  include recovery-resource.dat in /system/etc