am 495a95d4: Merge "system/security: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"

* commit '495a95d490e5e1a13a69fefb338473ada12495e3':
  system/security: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH
tree: 683565f5595c3d9a53c91d276c47c38f20c9d62e
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/