Merge "Adding deps for OmxCore_headers and gralloc_headers"