Merge "Remove obsolete LOCAL_JACK_FLAGS" am: 2e00f4eab1
am: 2ae0b719b9

Change-Id: I153029a84d137ce21f5cb1288a967f18549f2c9b