Use my frameworks base

Change-Id: I130f63d1ee65fb87cac11bc34f8d667134f11cc3