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

Change-Id: Ib7840cf059bccca236c609c4398ada4db83b553a
30 files changed