Switch to the new 4.2 handling of public symbols

Change-Id: Id98efdcee398fa637c5a2a76b95b0d4915222dde

Conflicts:
	core/res/res/values/public.xml
	core/res/res/values/symbols.xml
Revert "Switch to the new 4.2 handling of public symbols"

This reverts commit 162a898518a2456af832a4f8958b9731d6f72f8a.
Switch to the new 4.2 handling of public symbols

Change-Id: Id98efdcee398fa637c5a2a76b95b0d4915222dde

Conflicts:
	core/res/res/values/public.xml
	core/res/res/values/symbols.xml