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

Change-Id: I54e5f09d3779f43feff18da69ba288fcd63229ae