AOSP: keystore include directory difference

AOSP: keystore include directory difference

Upstream supports both the old and the new directory. Could be fine to
remove the old directory from upstream(?) to make these match.

This is related to this AOSP commit:

commit 07311dc4db7c5bbab9ebba7d3f9b9805e6ab7b24
Author: Kenny Root <kroot@google.com>
Date:   Wed Feb 15 15:08:06 2012 -0800

    Moving keystore to system/security

    keystore used to be in frameworks/base/cmds/keystore, but this include
    needs to be changed to support the move to system/security

    Change-Id: I583a193593576c2c3c7489fb8c27a29698e8a4c5