Merge "Include subdirectory Android.mks." into klp-modular-dev