Android S V2 Beta 3
Merge "Make bsdiff available in recovery"