Merge "Convert system/extras/tests to Soong"