Merge "Revert "Adding deps for libOmxCore and gralloc since they will not be copying headers anymore""