Merge "Keystore should be developed in AOSP."
am: 52f822d6ae

Change-Id: I5c728903e615650946940d39f9bf3b2a7033b11d