Android l-preview release 2
Merge "More test makefile cleanup."