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

Change-Id: I3a785a1e4841c1152e2043a0852cdb1715b1f7d1