Android CTS 5.0 Release 8 (2991207)
Update makefiles after merge

Change-Id: Ib123e2cb281ae812cb831c16e2da599bfbc7a2bb
10 files changed