Add module Android.mk config and adjust related test cases