Forget to add some files & revert some bluetooth changes

Change-Id: I5d7ba411c5f5081abe2d52ad2b650544524f4d64