1. vp8->aom 2. removed no-effect statements and spaces Change-Id: I367d05ff9bf1b9f3c71c517c45d8049d9d4236ec