Merge changes from topic 'installd_delete_odex' into nyc-mr1-dev
am: 67ce5f0c90

Change-Id: I5066391b9c3361b4b9415f02a1986db440f21a56