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

Change-Id: I9443752fb9cc751d655782cedf3c7c688500e1ee