Fix small problem and use legacy-aokp vendor