Merge "PDK: Remove dependency on frameworks/base"