Android CTS 8.0 Release 10 (4800267)
Fix the build flags. am: f2233f4546 am: 425c5485df am: cd960ab4e9
am: 1fe2b737ad

Change-Id: I14c4bb4494b6d7eb991bed9a1b79b5f5aaa0c01e