Make sure that any attributes removed from policy are declared
in the mapping file, in case they are relied upon by vendor
policy.
Bug: 36899958
Test: Builds successfull, but not with removed attribute not
in mapping file.
Change-Id: I25526cd88a50e90513ae298ccf4f2660e4627fb4
