On some "non-standard" devices, load label can cause a security exception due...

On some "non-standard" devices, load label can cause a security exception due to modified platform code
am: 0d86a8dc  -s ours

* commit '0d86a8dc':
  On some "non-standard" devices, load label can cause a security exception due to modified platform code

Change-Id: Ic2256db82871f26497f699dd4ded276db63ff0ac