Updated Makefile for AOSP compatibility