Merge "Fix Manifest for support-v13 aar." into klp-modular-dev