[atf][layoutlib] Cleanup data passing from bridge am: b1be588620 am: dbc35919d4 am: 467520b8c1 am: e1afb42166

Change-Id: Ibe33268f0948c0fd448b411de60500bedfa8ea9c