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