Merge changes from topics "delete_odex", "verify-prof" am: d8ee0ace65 am: 54d29c4070

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1734999

Change-Id: Ie71e0e5b0a8e551f799968115de7d14375c11679