Merge "Update Jack options to enable invoke-polymorphic"
am: d1aa2912f3

Change-Id: I1b095876451910ae5e9b8bfcce13b712e01aa72c