Fix layout params for TouchProxy

 Also fixes auto-merger wierdness...

Change-Id: I664dae43e1c16d177e79f1fd08ae6a6e3a2fd8e1
1 file changed