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

Change-Id: I1ed6a0665301150ce89397da54f8bfbf4c8f94bb