(Android) Build fixes