Merge "Remove dependency on libandroid" into sc-v2-dev