Merge "Fix hardware protected path for SDK ImageReader."