This reverts commit ef9de469. Reason for revert: Causes abidiff to misbehave. Change-Id: Ib7cac9081fa60f1abb55152292d6789cf519b14f
mentioned in commit 14e69a7a