[automerger skipped] Merge "Delete core_tiny.mk"
am: 8bc96c162c  -s ours

Change-Id: Id1da54536bf969ee0af656aaa4e2896c3f1c4031