Merge "Mark libbinder and libdumpstateutil as VNDK in Android.bp" into oc-mr1-dev