Merge "manifest: track philz touch recovery" into kitkat