fix mismerge pt2
Add EventLog event for logging of attempts to call java.lang.Object.getClass

Bug: 13694467
Change-Id: I886c6ffb3a008d0cf701c1adc16c607cbf7dce39
Merge tag 'android-4.4.4_r1' into kk-4.4

Android 4.4.4 Release 1
Merge branch 'kk-4.4' of https://github.com/AOSP-S4-KK/platform_frameworks_base into HEAD