Merge "Check LocalInfo descriptor for nullptr in dexlayout." am: 30b262c298 am: d185e7810f am: 9318eb7528
am: f1542fe17a

Change-Id: I0f1103e5403f709b31f9f3d9461e31b208783be4