Crosswalk M36 Gardening: More compile fixes on Android

Just adapting to upstream changes in APIs.