Changes to allow building of Android Community and Commercial engines.