track native for master bugfixes

Change-Id: Id42863d2bf3a153b2d7de01f84bd775699198f05
O3 optimized webp

Change-Id: Ie80ce88f6cffd1ffe138e787eaabc1b01e4f4c04
Merge branch 'jb43' of https://github.com/ParanoidAndroid/manifest into jb-mr2

Conflicts:
	default.xml