Merge "Fix typo when building aar"