Use fewer quotes, double quotes allow for variable expansion

Change-Id: Ida8483e2594c5728c6626ef26938617fbb8c6253
Use sed -i instead of cat X | sed > Y && cat Y > X

Change-Id: I6b559abed87959a083abb35cc0e2f0bc5acb84f1
Merge "Use sed -i instead of cat X | sed > Y && cat Y > X"
Merge "Use fewer quotes, double quotes allow for variable expansion"