marvel: fixes and cleanup for AOKP

Signed-off-by: olivieer <y.karasangabo@bg-rams.ac.at>