Revert "Separate libstagefright_omx into two libs"

This reverts commit c3d86f89d50ff6fa26d98c6f60615040294d1041.

Reason for revert: build break at elfin-userdebug 5409972 5410031

Change-Id: I2940521df410fcaf2ba3e2698ca912cb5182f496
31 files changed