Revert "rework android L"

This reverts commit 9dd0bc5bf056a61afd3cb547f9c94e2e23a6a60b.