am 5b8ec511: am b5c4c9e2: don\'t strip resources so it work on all devices

Merge commit '5b8ec5111331ab9a388b4698d48a7567e3a83c78'

* commit '5b8ec5111331ab9a388b4698d48a7567e3a83c78':
  don't strip resources so it work on all devices