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

Change-Id: If811a5b436025d7f0786fbdf140da1bd48cf053a