Optipng -nc -nb -o7

With the merger some need to be redone

Change-Id: I4e9f8d1ec95e99352933eb5fc23d7f14070f2dc7
Typo fix

Change-Id: I5424a2bb943f5f0e46fed2596df7fef1e8c34692