Fix Android 4.3 Merge

This fixes a set of build errors .. Rest to follow