Merge "Fix hardware protected path for AImageReader."