Android n mr1 preview 2
Fix the build flags. am: f2233f4546
am: 425c5485df

Change-Id: Ifcd033cd4f29d45ca308a32f835c5481494657ef