Skip 494ec19e from gingerbread-plus-aosp (already cherry-picked)

Change-Id: I319738dccfeb0be82fed2bcc58eb425b222bc0fa