Merge "Remove workaround for VNDK violations" into oc-mr1-dev am: 152687b26e
am: f631a98a31

Change-Id: Ic9c4597df4d26675524ce6ebb626d60e1eb9a014