Fix makefile for multi lib

in order to support both x86_64 and x86 we need the flag
in the build file. (Same for arm64 and 32).

Test: local build, check abi with aapt
Change-Id: Ia1e7667bb4ab438e3237b0da776acea95eead151
6 files changed