A workaround for apps using custom classloaders am: 7f9a1aa
am: 17f2a1e

* commit '17f2a1e550d3eb308fb793617db9994a75806add':
  A workaround for apps using custom classloaders

Change-Id: Ie081819dd0ce5f2cdb45fa2678e1702eeedf9a95