Merge "new LOCAL_DEX_PREOPT option "nostripping"" into ics-mr0