Merge "Add LOCAL_SDK_VERSION in platform_library" am: 929de51207
am: 82363f2ae0

Change-Id: I8cf86e3db8a2cb9205a2dc32afae8fa0a3501185