Merge changes I362ec1fc,I2d574855

* changes:
  SF: Introduce libsurfaceflinger_unittest
  SF: Convert to Android.bp