Merge "Removing keystore.default from core_tiny.mk and core_minimal.mk"
am: 96929d691e

Change-Id: I0a208412fe98cbd06b24bfba24f5f08edb95bb52