Support FDs for class loader context dex files am: 8982186538 am: 459107a923
am: d61d30778f

Change-Id: Ic1b35b05748b6c090180de6364ea948bd421db00