Merge changes from topic "dexfile-hooks"
am: 5ce7e0d115

Change-Id: I900a9ecb2fa87ff7ebeefa8fc8d1c9776a4ad135