AndroidSDK: Naming consistency and doc fixes