Merge "Common mk file for both arm64 and x86 targets" into rvc-dev