Attempt to bring android and ubuntu branches in alignment