(Android) Build fixes/cleanups to frontend