For now, we want to keep being able to just say for instance "make run" in the
android app directories.

Change-Id: I1898d5466c0df6007fa32b202888bed644fa9489