Merge "Don't use android namespaces in docs" into pi-dev