Remove override for the ril layer and switch branch for system/core

Signed-off-by: Simon Busch <morphis@gravedo.de>