Merge "Use -Werror in device/sample/frameworks/PlatformLibrary/jni"
am: eb92aefead

Change-Id: I309cf8a5fb814a8a9eef7814b9fa3e3f51bde62c