Android n mr1 preview 2
Merge "Remove $(shell) from Makefile"