Merge "Android.mk: add a flag to control shared/static lib"