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

Change-Id: I9765a85510d6d7bf2695c7769adf42ffc1fd7a55