Merge "Update makefiles for vndk enabled." into oc-mr1-dev am: d9b12c13e5
am: a7a300a13b

Change-Id: I4624aae28e0ccd493af5030c8e507aff25bc5743