bring inline with AOKP and track some project paths