A workaround for apps using custom classloaders
am: 7f9a1aa

* commit '7f9a1aaf05dda20904f08a667dadcf555a41477e':
  A workaround for apps using custom classloaders

Change-Id: I0e0c8325f2b1403bd6534f9f97434f0ce2b3c64d