Switch to the new 4.2 handling of public symbols

Change-Id: Id98efdcee398fa637c5a2a76b95b0d4915222dde