new android interactor and cleanup

Change-Id: I95979274e2162a8b674894052a0842a3d068c0fb
some shader cleanup

Change-Id: Ib07ac87242574ede0eed8f38d2964bf33011fe1d
some android fixes in progress

Change-Id: I8cc21f9391d8997ccf70b47fca1b2683ebb8fb7a