Merge "Fix /system/app/$app.odex not updated issue"