Convert all variables in Makefile.defines to be of the simply-expanded flavor. As a side-effect, OBJECTS must be moved from Makefile.defines to Makefile.targets. This commit is a cleanup for Android. Rationale ---------