Removed reliance on android.os packages