Fix Android Makefiles for rebase to r264688.

Bug: http://b/28149048

Change-Id: I0f7eb57e218de9c42de993665cac7e787e161469
10 files changed