Update ApiDemo and Support4 resources

Fixed compiler errors caused by using @+android:id over @+id