Merge "Add support for loading trusted dex files." am: aecf0ee9bf
am: 60cfdd2920

Change-Id: I1ae5df7284e9f9b3016e30e7fa368e54192dd36b