Update to make it can be compiled with Android5.0 and master

One change is on Android.mk for compile with the AOSP master branch,
Another change is on droid_surfaceflingerlink.cpp which is for compiling with the Android5.0 version