Merge "Revert "Temporarily disable lazy class-file-load-hook""
am: 14ef97b0a7

Change-Id: I97ba07a29a00a0ccfd2acd65e0ea76f628fd97bb