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

Change-Id: I44d51b4632ddf19364b8eb1e636d13eb77d8adfc