Fix android build

Change-Id: Iee1d84e428a27917bbaaf0df95763794e9b4cca6