[atf][layoutlib] Cleanup data passing from bridge am: b1be588620 am: 1072d5ae11 am: d4c98bf417

Change-Id: I693dc4391ca1f2dfa148876f66a6d29801678fe5