Merge "Add empty.mk" am: 6008e0ff3a am: e22e62c090

Original change: https://android-review.googlesource.com/c/platform/development/+/1635459

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idecf23d739732a8ccf3962b86d49d307f013a4bc