This change should make the Android targets compile again. The reason for the failure was a highly dubious structure in the gypi files. With this fix, the structure is somewhat cleaner. Still room for improvement. BUG=3254 TBR=andrew@webrtc.org Review URL: https://webrtc-codereview.appspot.com/15369004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@5972 4adac7df-926f-26a2-2b94-8c16560cd09d