Fix bugs caused by Hwui and Skia syncing

After syncing aosp/internal master to up-to-date version, Hwui and Skia
cannot build correctly in the suite. Did several modification to fix
them:
  -Fixed blueprint file patch in Hwui
  -Fixed blueprint file patch in Skia
  -Removed Skia patch since its no longer needed
  -Fixed indentation in diff files

Test: Rebuilt Skia and Hwui successfully
Change-Id: I075737c038368a0a36f968e22936c53477f6b125