Google to Android phone makers: Our new deal means you must patch for two years