Merge "Stop recording unsupported class loaders."
am: c90f30d1d9

Change-Id: Ie89804c75a652608481e70bcf27b95ced43a578c