Revert "[FP5-2743] Add patch for Aug Mainline upgrade"

This reverts commit 4833325fba51c319924ec7e4d5577e63cd597847.

Change-Id: Ib3c2d1ae79ff2d72498bde15007fdc193fe6b643
7 files changed