fix Android build + compiler warnings

Change-Id: I1cadc4f21c1889be68beaf90dca926910440ebde
ChangeLog v1.5.1 -> v1.6