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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7edaa35f3548a7c5ce59c30c7565ec134258743b