Merge "Add module_control to AndroidTest.xml" into rvc-dev