Merge "Convert system/extras/tests to Soong"
am: 13be680693

Change-Id: I734184e6e94876db19271a84d9ba06436f8083da