Merge "Mark libmemtrack as VNDK in Android.bp"