Add missing public entries and fix up symbols

Android has became so weird to add stuff on framework :/

Change-Id: I8bbc63c40c6cfadf3298e45cd103f174fd006225