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

Change-Id: I57eec02528b38931a5eca28a19f1ba385336e131