Merge "Check LocalInfo descriptor for nullptr in dexlayout."
am: 30b262c298

Change-Id: I2ccad5503b0d99096a24a10624aca100621bd531