Merge "Add /system/product/* paths to permitted paths" am: c733e5af3c
am: af818a799d

Change-Id: I8f8777531bfd71550609d4c95f175469a6abeded