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

Change-Id: I49a62a37d15d760fad0aa0dc2401b3c2be1f0bfd