Merge "Mark libmemtrack as VNDK in Android.bp" into oc-mr1-dev