Better detection of Android Version; Simplified regex