Merge "clean up CL for androidmk variables"
1 file changed