[SUBMODULE-APPLY] Apply fixed build and running of Android functionality
unit-test.