Merge "libstagefright_foundation_defaults: Remove libhardware_headers dependency" am: 00ca921829 am: 2924aa9808 am: 6d2e170bb8

Change-Id: Ib65dfdede48e696c3e369ee0235d20c3677d34cb