Merge "ExtractorUnitTest: Enable midi tests" am: 8be9a1bb7c am: 62a021be53

Change-Id: I06b610500e1873da5a082281683324f48cae81f6