Merge "Update makefiles for vndk enabled." into oc-mr1-dev

diff --cc bluetooth/1.0/Android.bp
Simple merge

diff --cc boot/1.0/Android.bp
Simple merge

diff --cc configstore/1.0/Android.bp
Simple merge

diff --cc ir/1.0/Android.bp
Simple merge

diff --cc nfc/1.0/Android.bp
Simple merge

diff --cc radio/1.0/Android.bp
Simple merge

diff --cc radio/1.1/Android.bp
Simple merge

diff --cc radio/deprecated/1.0/Android.bp
Simple merge

diff --cc renderscript/1.0/Android.bp
Simple merge

diff --cc tests/bar/1.0/Android.bp
Simple merge

diff --cc tests/baz/1.0/Android.bp
Simple merge

diff --cc tests/expression/1.0/Android.bp
Simple merge

diff --cc tests/foo/1.0/Android.bp
Simple merge

diff --cc tests/hash/1.0/Android.bp
Simple merge

diff --cc tests/inheritance/1.0/Android.bp
Simple merge

diff --cc tests/libhwbinder/1.0/Android.bp
Simple merge

diff --cc tests/memory/1.0/Android.bp
Simple merge

diff --cc tests/msgq/1.0/Android.bp
Simple merge

diff --cc tests/multithread/1.0/Android.bp
Simple merge

diff --cc tests/pointer/1.0/Android.bp
Simple merge

diff --cc tetheroffload/config/1.0/Android.bp
Simple merge

diff --cc tetheroffload/control/1.0/Android.bp
Simple merge

diff --cc wifi/1.0/Android.bp
Simple merge

diff --cc wifi/supplicant/1.0/Android.bp
Simple merge