am b3e6fa5e: Merge "new LOCAL_DEX_PREOPT option "nostripping"" into ics-mr0

* commit 'b3e6fa5e6bdaf6e1e827c3e79ffda1ef796b3a1b':
  new LOCAL_DEX_PREOPT option "nostripping"