Revert^2 "libandroidfw hardening for IncFs" am: 80094e39f9 am: ab46005fe8

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519909

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0e2c3cc5e4e7dc5b0622da41953f6c3d29780ef1