Track my frameworks/base and Settings

Change-Id: Ie348b8b1ec1830750ed74bdcb310a5f3aad67fea