Temporary move BPI to aakb, so make file have been updated
Fixed merge conflict in make file