Fix builds with readonly source directories am: 63f822dff8 am: bf216ce629  -s ours
am: 7f829de8b0

Change-Id: I82cd05867439488507d46472c998a6319ae0923a