Modified sample Android definitions based on Android schema changes.